Try to fix weird issues with PDE

git-svn-id: https://svn.argeo.org/slc/trunk@4142 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/slc_repo.properties b/demo/slc_repo.properties
index fc4d90a5ed5ef3e69dbbecfd7cd5fdf80ad21d8a..64b05a64389a0c9049558b5dc0f39f7fe20022b8 100644 (file)
--- a/demo/slc_repo.properties
+++ b/demo/slc_repo.properties
@@ -1,6 +1,7 @@
 argeo.osgi.start=\
 org.springframework.osgi.extender,\
 org.argeo.slc.support.maven,\
+org.argeo.slc.server.jackrabbit.pgsql,\
 org.argeo.slc.server.repo,\
 
 log4j.configuration=file:../../log4j.properties

diff --git a/dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product b/dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product
index 4cde85437ecc3e4f5f769a360d9fa3a70c4a2ca9..ed313d77fa180618ba2435d728615eaa740c8ece 100644 (file)
--- a/dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product
+++ b/dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product
@@ -63,7 +63,6 @@
       <plugin id="com.springsource.net.sf.cglib"/>
       <plugin id="com.springsource.net.sf.ehcache"/>
       <plugin id="com.springsource.net.sourceforge.jtds"/>
-      <plugin id="com.springsource.oracle.jdbc" fragment=""/>
       <plugin id="com.springsource.org.antlr"/>
       <plugin id="com.springsource.org.aopalliance"/>
       <plugin id="com.springsource.org.apache.bsf"/>

diff --git a/dep/pom.xml b/dep/pom.xml
index 4d5f11d4f516e147959b9ae71878408ce0c697ff..1028867794c58964c60bb241eb78005408f32f4d 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -79,6 +79,9 @@
                                                                <goal>pde-sources</goal>
                                                        </goals>
                                                        <phase>generate-resources</phase>
+                                                       <configuration>
+                                                               <copyArtifacts>false</copyArtifacts>
+                                                       </configuration>
                                                </execution>
                                                <execution>
                                                        <id>generate-descriptors</id>

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/.project b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/.project
new file mode 100644 (file)
index 0000000..b29fe5a
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.server.jackrabbit.pgsql</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/.settings/org.eclipse.pde.core.prefs b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..9d3e030
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Mon Feb 14 14:22:46 CET 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..0333a55
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/MANIFEST.MF
@@ -0,0 +1,10 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Pgsql
+Bundle-SymbolicName: org.argeo.slc.server.jackrabbit.pgsql
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Argeo
+Import-Package: javax.jcr;version="[2.0.0,3.0.0)",
+ org.argeo.server.jackrabbit,
+ org.postgresql;version="[8.3.0,9.0.0)",
+ org.springframework.beans.factory.config;version="2.5.6.SEC01"

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit-osgi.xml b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit-osgi.xml
new file mode 100644 (file)
index 0000000..f6f4aed
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit-osgi.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
+       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
+       http://www.springframework.org/schema/beans   \r
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <service ref="jcrRepository" interface="javax.jcr.Repository"/>\r
+\r
+</beans:beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml
new file mode 100644 (file)
index 0000000..39daf0f
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+       <bean
+               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+               <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+               <property name="locations">
+                       <value>osgibundle:jackrabbit.properties</value>
+               </property>
+       </bean>
+
+       <bean id="jcrRepository" class="org.argeo.server.jackrabbit.JackrabbitContainer">
+               <property name="homeDirectory" value="${slc.jackrabbit.home}" />
+               <property name="configuration" value="${slc.jackrabbit.configuration}" />
+               <property name="variables" value="osgibundle:/jackrabbit.properties" />
+               <property name="namespaces">
+                       <map>
+                               <entry key="slc" value="http://www.argeo.org/slc" />
+                       </map>
+               </property>
+               <!-- <property name="cndFiles"> -->
+               <!-- <list> -->
+               <!-- <value>classpath:/org/argeo/slc/repo/repo.cnd</value> -->
+               <!-- </list> -->
+               <!-- </property> -->
+       </bean>
+</beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/build.properties b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/jackrabbit.properties b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/jackrabbit.properties
new file mode 100644 (file)
index 0000000..c25991a
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/jackrabbit.properties
@@ -0,0 +1,5 @@
+slc.jackrabbit.home=${user.home}/.slc/repo/jackrabbit
+slc.jackrabbit.configuration=osgibundle:/repository.xml
+slc.jackrabbit.dburl=jdbc:postgresql://air:5432/slc
+slc.jackrabbit.dbuser=argeo
+slc.jackrabbit.dbpassword=argeo
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml
new file mode 100644 (file)
index 0000000..f76929d
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN"
+                            "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+<Repository>
+       <!-- Shared datasource -->
+       <DataSources>
+               <DataSource name="dataSource">
+                       <param name="driver" value="org.postgresql.Driver" />
+                       <param name="url" value="${slc.jackrabbit.dburl}" />
+                       <param name="user" value="${slc.jackrabbit.dbuser}" />
+                       <param name="password" value="${slc.jackrabbit.dbpassword}" />
+                       <param name="databaseType" value="postgresql" />
+                       <param name="maxPoolSize" value="10" />
+               </DataSource>
+       </DataSources>
+
+       <!-- File system and datastore -->
+       <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+               <param name="dataSourceName" value="dataSource" />
+               <param name="schema" value="postgresql" />
+               <param name="schemaObjectPrefix" value="fs_" />
+       </FileSystem>
+       <DataStore class="org.apache.jackrabbit.core.data.db.DbDataStore">
+               <param name="dataSourceName" value="dataSource" />
+               <param name="schemaObjectPrefix" value="ds_" />
+       </DataStore>
+
+       <!-- Workspace templates -->
+       <Workspaces rootPath="${rep.home}/workspaces"
+               defaultWorkspace="default" />
+       <Workspace name="${wsp.name}">
+               <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+                       <param name="dataSourceName" value="dataSource" />
+                       <param name="schema" value="postgresql" />
+                       <param name="schemaObjectPrefix" value="fs_${wsp.name}_" />
+               </FileSystem>
+               <PersistenceManager
+                       class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
+                       <param name="dataSourceName" value="dataSource" />
+                       <param name="schemaObjectPrefix" value="pm_${wsp.name}_" />
+               </PersistenceManager>
+               <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+                       <param name="path" value="${wsp.home}/index" />
+               </SearchIndex>
+       </Workspace>
+
+       <!-- Versioning -->
+       <Versioning rootPath="${rep.home}/version">
+               <FileSystem class="org.apache.jackrabbit.core.fs.db.DbFileSystem">
+                       <param name="dataSourceName" value="dataSource" />
+                       <param name="schema" value="postgresql" />
+                       <param name="schemaObjectPrefix" value="fs_ver_" />
+               </FileSystem>
+               <PersistenceManager
+                       class="org.apache.jackrabbit.core.persistence.pool.PostgreSQLPersistenceManager">
+                       <param name="dataSourceName" value="dataSource" />
+                       <param name="schemaObjectPrefix" value="pm_ver_" />
+               </PersistenceManager>
+       </Versioning>
+
+       <!-- Indexing -->
+       <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+               <param name="path" value="${rep.home}/repository/index" />
+               <param name="extractorPoolSize" value="2" />
+               <param name="supportHighlighting" value="true" />
+       </SearchIndex>
+
+       <!-- Security -->
+       <Security appName="Jackrabbit">
+               <SecurityManager
+                       class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager"
+                       workspaceName="security">
+               </SecurityManager>
+               <AccessManager
+                       class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager">
+               </AccessManager>
+               <!-- <LoginModule -->
+               <!-- class="org.springframework.security.providers.jaas.SecurityContextLoginModule"> -->
+               <!-- </LoginModule> -->
+               <LoginModule
+                       class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule">
+                       <param name="anonymousId" value="anonymous" />
+                       <param name="adminId" value="admin" />
+               </LoginModule>
+       </Security>
+</Repository>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
index 27347f2b526d357f8eaf706d37cb34a742628a65..54f7482a0f1914afa38c009f1104d9bb369e63b7 100644 (file)
--- a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
@@ -3,7 +3,9 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Repo
 Bundle-SymbolicName: org.argeo.slc.server.repo
 Bundle-Version: 1.0.0.qualifier
-Import-Package: org.argeo.slc.aether,
+Import-Package: org.argeo.jcr,
+ org.argeo.server.jackrabbit,
+ org.argeo.slc.aether,
  org.argeo.slc.aether.spring,
  org.argeo.slc.repo.maven,
  org.sonatype.aether;version="1.9.0"

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
new file mode 100644 (file)
index 0000000..92b9c94
--- /dev/null
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
+\r
+       <bean id="jcrSession" class="org.argeo.jcr.ThreadBoundJcrSessionFactory">\r
+               <property name="repository" ref="jcrRepository" />\r
+       </bean>\r
+</beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
index 395a4edaeb233555dface4396521b39176fc3727..45fcf7bc85f04eba324f9b88d4a7da1b9cb9b147 100644 (file)
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/maven.xml
@@ -8,8 +8,7 @@
        ">
 
 
-       <bean class="org.argeo.slc.repo.maven.ImportMavenDependencies"
-               init-method="run">
+       <bean class="org.argeo.slc.repo.maven.ImportMavenDependencies">
                <property name="rootCoordinates"
                        value="org.argeo.dep:versions-all:pom:1.1.3-SNAPSHOT" />
                <property name="aetherTemplate" ref="mavenAetherTemplate" />

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
index b5987612c5d9114f6c681014a3dea6c4b2041341..aad718c8607124e6be54998352bd79e506ab2756 100644 (file)
--- a/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml
@@ -7,7 +7,8 @@
        http://www.springframework.org/schema/beans   \r
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
        http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">\r
-       <!-- <reference id="jcrRepository" interface="javax.jcr.Repository" /> -->\r
+\r
+       <reference id="jcrRepository" interface="javax.jcr.Repository" />\r
 \r
        <!-- Maven -->\r
        <reference id="mavenRepositorySystem" interface="org.sonatype.aether.RepositorySystem"\r

diff --git a/runtime/org.argeo.slc.core/.classpath b/runtime/org.argeo.slc.core/.classpath
index 62daaabf543f61b23ff13a40ceea28677f2210b9..5b3e7b8c6a6008e2bf2c911d82bc528dc828f419 100644 (file)
--- a/runtime/org.argeo.slc.core/.classpath
+++ b/runtime/org.argeo.slc.core/.classpath
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <classpathentry kind="src" path="src/main/java" output="target/classes" />
+       <classpathentry kind="src" path="src/main/resources"
+               output="target/classes" />
+       <classpathentry kind="src" output="target/test-classes"
+               path="src/test/java" />
+       <classpathentry kind="src" output="target/test-classes"
+               path="src/test/resources" />
+       <classpathentry kind="con"
+               path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
+       <classpathentry kind="con"
+               path="org.eclipse.pde.core.requiredPlugins" />
+       <classpathentry kind="output" path="target/classes" />
 </classpath>

diff --git a/runtime/org.argeo.slc.core/.settings/org.eclipse.pde.core.prefs b/runtime/org.argeo.slc.core/.settings/org.eclipse.pde.core.prefs
index 59b0c91ae9a597f0997481fd166b26a47df70891..701feb44ec85fcf638dc0cbce6deda8057177632 100644 (file)
--- a/runtime/org.argeo.slc.core/.settings/org.eclipse.pde.core.prefs
+++ b/runtime/org.argeo.slc.core/.settings/org.eclipse.pde.core.prefs
@@ -1,5 +1,6 @@
-#Fri Jan 15 10:53:00 CET 2010
+#Mon Feb 14 20:13:06 CET 2011
 eclipse.preferences.version=1
 pluginProject.equinox=false
 pluginProject.extensions=false
 resolve.requirebundle=false
+selfhosting.binExcludes=/org.argeo.slc.core/target/test-classes,/org.argeo.slc.core/target/test-classes

diff --git a/runtime/org.argeo.slc.detached.launcher/.classpath b/runtime/org.argeo.slc.detached.launcher/.classpath
index 73ba12c2eada5b5a04bc37083084a28b61fb6272..7430a31e5dc803106d0e4ddb72432ea08fc9e68d 100644 (file)
--- a/runtime/org.argeo.slc.detached.launcher/.classpath
+++ b/runtime/org.argeo.slc.detached.launcher/.classpath
@@ -4,5 +4,5 @@
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.detached/.classpath b/runtime/org.argeo.slc.detached/.classpath
index 73ba12c2eada5b5a04bc37083084a28b61fb6272..7430a31e5dc803106d0e4ddb72432ea08fc9e68d 100644 (file)
--- a/runtime/org.argeo.slc.detached/.classpath
+++ b/runtime/org.argeo.slc.detached/.classpath
@@ -4,5 +4,5 @@
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.launcher/.classpath b/runtime/org.argeo.slc.launcher/.classpath
index 73ba12c2eada5b5a04bc37083084a28b61fb6272..7430a31e5dc803106d0e4ddb72432ea08fc9e68d 100644 (file)
--- a/runtime/org.argeo.slc.launcher/.classpath
+++ b/runtime/org.argeo.slc.launcher/.classpath
@@ -4,5 +4,5 @@
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.lib.detached/.classpath b/runtime/org.argeo.slc.lib.detached/.classpath
index 110fd7f0b1110a8a65097dcfb44037afd6ad6938..ea37d312030a04df03e1b18596fe79df974312e8 100644 (file)
--- a/runtime/org.argeo.slc.lib.detached/.classpath
+++ b/runtime/org.argeo.slc.lib.detached/.classpath
@@ -6,5 +6,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/runtime/org.argeo.slc.repo/.classpath b/runtime/org.argeo.slc.repo/.classpath
index 92f19d2ff95b83a87f5210157582c70bb070ed48..d3d5c80958677f1f8de5b580c289b3baf7c5452c 100644 (file)
--- a/runtime/org.argeo.slc.repo/.classpath
+++ b/runtime/org.argeo.slc.repo/.classpath
@@ -3,5 +3,6 @@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml
index 018e1cfd1e2e39dc63848d51712475f5b960e89f..b92619459d7b495c4d7a07176af3dd137af56d69 100644 (file)
--- a/runtime/org.argeo.slc.repo/pom.xml
+++ b/runtime/org.argeo.slc.repo/pom.xml
@@ -27,6 +27,12 @@
                </plugins>
        </build>
        <dependencies>
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.jcr</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.aether</artifactId>

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
index 8aff3de08f21beba8d54e10cccd87097bde7c841..bf5d98ac955f2ac63ca872ff78c70fe4ef673bc4 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/maven/ImportMavenDependencies.java
@@ -2,14 +2,13 @@ package org.argeo.slc.repo.maven;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.StringReader;
-import java.io.StringWriter;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 
+import javax.jcr.Session;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
@@ -17,11 +16,9 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.aether.AetherTemplate;
-import org.argeo.slc.aether.AetherUtils;
 import org.sonatype.aether.artifact.Artifact;
 import org.sonatype.aether.graph.DependencyNode;
 import org.sonatype.aether.util.artifact.DefaultArtifact;
-import org.sonatype.aether.util.graph.PreorderNodeListGenerator;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -34,23 +31,15 @@ public class ImportMavenDependencies implements Runnable {
        private String rootCoordinates;
        private Set<String> excludedArtifacts = new HashSet<String>();
 
+       private Session jcrSession;
+
        public void run() {
+               Set<Artifact> artifacts = resolveDistribution();
+       }
+
+       public Set<Artifact> resolveDistribution() {
                try {
                        Artifact pomArtifact = new DefaultArtifact(rootCoordinates);
-
-                       // {
-                       // DependencyNode node = aetherTemplate
-                       // .resolveDependencies(pomArtifact);
-                       //
-                       // PreorderNodeListGenerator nlg = new PreorderNodeListGenerator();
-                       // node.accept(nlg);
-                       //
-                       // for (Artifact artifact : nlg.getArtifacts(true)) {
-                       // log.debug(artifact);
-                       // }
-                       // AetherUtils.logDependencyNode(0, node);
-                       // }
-
                        Comparator<Artifact> artifactComparator = new Comparator<Artifact>() {
                                public int compare(Artifact o1, Artifact o2) {
                                        return o1.getArtifactId().compareTo(o2.getArtifactId());
@@ -93,11 +82,17 @@ public class ImportMavenDependencies implements Runnable {
                        distributionDescriptor.store(out, "");
                        log.debug(new String(out.toByteArray()));
                        out.close();
+
+                       return artifacts;
                } catch (Exception e) {
-                       throw new SlcException("Cannot resolve", e);
+                       throw new SlcException("Cannot resolve distribution", e);
                }
        }
 
+       protected void syncDistribution(Set<Artifact> artifacts) {
+
+       }
+
        /** Recursively adds non optional dependencies */
        private void addDependencies(Set<Artifact> artifacts, DependencyNode node) {
                for (DependencyNode child : node.getChildren()) {
@@ -197,4 +192,8 @@ public class ImportMavenDependencies implements Runnable {
                this.rootCoordinates = rootCoordinates;
        }
 
+       public void setJcrSession(Session jcrSession) {
+               this.jcrSession = jcrSession;
+       }
+
 }

diff --git a/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd b/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd
new file mode 100644 (file)
index 0000000..c2e7019
--- /dev/null
+++ b/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd
@@ -0,0 +1,49 @@
+<sebi = 'http://www.agfa.com/sebi'>
+
+[sebi:ebi] > nt:base
+//
+// GENERIC
+//
+- sebi:ebiTag (STRING) primary m
+- sebi:ebiName (STRING) m
+- sebi:ebiUniqueId (LONG) m
+- sebi:ebiRpStatus (STRING) m
+- sebi:ebiRpAssociatedVersion (STRING) m
+- sebi:ebiOrbisModule (STRING) m
+- sebi:ebiTracedTo (STRING) m
+
+// BPR are sometimes missing
+- sebi:ebiBpr (STRING)
+- sebi:bprProcessCode (STRING)
+- sebi:appendixBRef (STRING)
+
+- sebi:ebiRequirementText (STRING) m
+- sebi:ebiRpDate (DATE) m
+- sebi:sebiCreationDate (DATE) m
+- sebi:sebiLastUpdate (DATE) m
+- sebi:sebiLastUpdateUser (STRING)
+
+// 'TWIN' FIELDS
+- sebi:bprProcessCodeSebi (STRING)
+- sebi:appendixBRefSebi (STRING)
+
+//
+// AP-HP specific
+//
+- sebi:ebiRpVersionLastUpdate (STRING)
+- sebi:isOutsideAphp (BOOLEAN) = 'false' m a
+- sebi:forseenDelivSprint (DATE)
+- sebi:forseenDelivSprintLastUpdate (DATE)
+- sebi:projectStatus (STRING)
+- sebi:aphpDelivDate (DATE)
+- sebi:effectiveDelivSprint (STRING)
+- sebi:effectiveDelivSprintLastUpdate (DATE)
+- sebi:ebiNameFr (STRING) = '' m a
+- sebi:ebiDescLastUpdate (DATE)
+- sebi:ebiDescFr (STRING) = '' m a
+- sebi:ebiDescFrLastUpdate (DATE)
+- sebi:consultant (STRING)
+- sebi:solutionManager (STRING)
+- sebi:productOwner (STRING)
+- sebi:tpoRef (STRING)
+- sebi:comments (STRING) = '' m a

diff --git a/runtime/org.argeo.slc.server/.classpath b/runtime/org.argeo.slc.server/.classpath
index 4ec9b5cb1f470e4f33ac32b919ebd7acf7b52755..82e8c6774e2a1d7c15cfa39b03a2d6a005a5fe97 100644 (file)
--- a/runtime/org.argeo.slc.server/.classpath
+++ b/runtime/org.argeo.slc.server/.classpath
@@ -5,5 +5,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/runtime/org.argeo.slc.specs/.classpath b/runtime/org.argeo.slc.specs/.classpath
index 8b978d9ede4d96fb47cbd858fc3b6607968c677f..b9f9fd2f3f1ac55e10fc3b14a79bc5c0142a9200 100644 (file)
--- a/runtime/org.argeo.slc.specs/.classpath
+++ b/runtime/org.argeo.slc.specs/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/main/java"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/runtime/org.argeo.slc.support.activemq/.classpath b/runtime/org.argeo.slc.support.activemq/.classpath
index 73ba12c2eada5b5a04bc37083084a28b61fb6272..7430a31e5dc803106d0e4ddb72432ea08fc9e68d 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/.classpath
+++ b/runtime/org.argeo.slc.support.activemq/.classpath
@@ -4,5 +4,5 @@
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.support.activemq/build.properties b/runtime/org.argeo.slc.support.activemq/build.properties
index 4453b0d9cfed9cbadf68ff5695afaa7959d89050..f0cc4f1b43c262c9693fede291318a41f0f351ef 100644 (file)
--- a/runtime/org.argeo.slc.support.activemq/build.properties
+++ b/runtime/org.argeo.slc.support.activemq/build.properties
@@ -1,3 +1,2 @@
 source.. = src/main/java/,\
-           src/main/resources/,\
-           .
+           src/main/resources/

diff --git a/runtime/org.argeo.slc.support.ant/.classpath b/runtime/org.argeo.slc.support.ant/.classpath
index 110fd7f0b1110a8a65097dcfb44037afd6ad6938..ea37d312030a04df03e1b18596fe79df974312e8 100644 (file)
--- a/runtime/org.argeo.slc.support.ant/.classpath
+++ b/runtime/org.argeo.slc.support.ant/.classpath
@@ -6,5 +6,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/runtime/org.argeo.slc.support.castor/.classpath b/runtime/org.argeo.slc.support.castor/.classpath
index 16c8205a870925a3e3a1dab7f2ca8d56f91d7768..762e65304a45132d5d1e220c1529aa25d8e5da91 100644 (file)
--- a/runtime/org.argeo.slc.support.castor/.classpath
+++ b/runtime/org.argeo.slc.support.castor/.classpath
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="src/main/java"/>\r
-       <classpathentry kind="src" path="src/main/resources"/>\r
-       <classpathentry kind="src" path="src/test/java"/>\r
-       <classpathentry kind="src" path="src/test/resources"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/runtime/org.argeo.slc.support.equinox/.classpath b/runtime/org.argeo.slc.support.equinox/.classpath
index 3e6ecf767d5519108c40bc9c9ea27c164872ca49..762e65304a45132d5d1e220c1529aa25d8e5da91 100644 (file)
--- a/runtime/org.argeo.slc.support.equinox/.classpath
+++ b/runtime/org.argeo.slc.support.equinox/.classpath
@@ -6,5 +6,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.support.gis/.classpath b/runtime/org.argeo.slc.support.gis/.classpath
index dff8aa650ea0c24052e80f711032d4a14cb1a71a..f0a46691b4730afa6bfbb9cbd442f3a56eb213a2 100644 (file)
--- a/runtime/org.argeo.slc.support.gis/.classpath
+++ b/runtime/org.argeo.slc.support.gis/.classpath
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="src" path="src/test/resources"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+       <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+       <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/runtime/org.argeo.slc.support.hibernate/.classpath b/runtime/org.argeo.slc.support.hibernate/.classpath
index 110fd7f0b1110a8a65097dcfb44037afd6ad6938..ea37d312030a04df03e1b18596fe79df974312e8 100644 (file)
--- a/runtime/org.argeo.slc.support.hibernate/.classpath
+++ b/runtime/org.argeo.slc.support.hibernate/.classpath
@@ -6,5 +6,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/runtime/org.argeo.slc.support.hibernate/.settings/org.eclipse.pde.core.prefs b/runtime/org.argeo.slc.support.hibernate/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..0572a4a
--- /dev/null
+++ b/runtime/org.argeo.slc.support.hibernate/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+#Mon Feb 14 20:13:33 CET 2011
+eclipse.preferences.version=1
+selfhosting.binExcludes=/org.argeo.slc.support.hibernate/target/test-classes,/org.argeo.slc.support.hibernate/target/test-classes

diff --git a/runtime/org.argeo.slc.support.hibernate/pom.xml b/runtime/org.argeo.slc.support.hibernate/pom.xml
index 5d1705a1c71ee55e4ca7fd71c66c6033b5771cda..fafa6ffde6ee5b55cef35c0d58f91bf3f86b23b0 100644 (file)
--- a/runtime/org.argeo.slc.support.hibernate/pom.xml
+++ b/runtime/org.argeo.slc.support.hibernate/pom.xml
@@ -19,7 +19,7 @@
                                <configuration>
                                        <instructions>
                                                <Fragment-Host>org.argeo.slc.core</Fragment-Host>
-                                               <Import-Package>*,org.hibernate.proxy,javassist.util.proxy</Import-Package>
+                                               <Import-Package>!org.argeo.slc.core.*,org.hibernate.proxy,javassist.util.proxy,*</Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>

diff --git a/runtime/org.argeo.slc.support.jcr/.classpath b/runtime/org.argeo.slc.support.jcr/.classpath
index 3e6ecf767d5519108c40bc9c9ea27c164872ca49..762e65304a45132d5d1e220c1529aa25d8e5da91 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/.classpath
+++ b/runtime/org.argeo.slc.support.jcr/.classpath
@@ -6,5 +6,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.support.jemmy/.classpath b/runtime/org.argeo.slc.support.jemmy/.classpath
index 90d9c1bfdb8c088a54191973e309ac4534fb8646..e7acc2254a30815b50b3823e151f22f91302ff57 100644 (file)
--- a/runtime/org.argeo.slc.support.jemmy/.classpath
+++ b/runtime/org.argeo.slc.support.jemmy/.classpath
@@ -6,5 +6,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.support.osgi/.classpath b/runtime/org.argeo.slc.support.osgi/.classpath
index a0707243bdea6c3287ce031ea4bf98883b9b586d..62daaabf543f61b23ff13a40ceea28677f2210b9 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/.classpath
+++ b/runtime/org.argeo.slc.support.osgi/.classpath
@@ -6,5 +6,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="output" path="bin"/>
+       <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/runtime/org.argeo.slc.support.simple/.classpath b/runtime/org.argeo.slc.support.simple/.classpath
index 75d3035480c2d533f160cac6b2169850ece051d6..9633ef11f0cf76cec7b80c7f32db294e8a94a6c0 100644 (file)
--- a/runtime/org.argeo.slc.support.simple/.classpath
+++ b/runtime/org.argeo.slc.support.simple/.classpath
@@ -5,5 +5,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r

diff --git a/runtime/org.argeo.slc.unit/.classpath b/runtime/org.argeo.slc.unit/.classpath
index 110fd7f0b1110a8a65097dcfb44037afd6ad6938..ea37d312030a04df03e1b18596fe79df974312e8 100644 (file)
--- a/runtime/org.argeo.slc.unit/.classpath
+++ b/runtime/org.argeo.slc.unit/.classpath
@@ -6,5 +6,5 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>\r
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>\r
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="output" path="bin"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
 </classpath>\r