From 590c0a5532066231aac134157ba3b22151d88b7e Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 14 Feb 2011 19:23:29 +0000 Subject: [PATCH] Try to fix weird issues with PDE git-svn-id: https://svn.argeo.org/slc/trunk@4142 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/slc_repo.properties | 1 + .../slc-client-rcp.product | 1 - dep/pom.xml | 3 + .../.project | 22 +++++ .../.settings/org.eclipse.pde.core.prefs | 4 + .../META-INF/MANIFEST.MF | 10 +++ .../META-INF/spring/jackrabbit-osgi.xml | 11 +++ .../META-INF/spring/jackrabbit.xml | 29 +++++++ .../build.properties | 1 + .../jackrabbit.properties | 5 ++ .../repository.xml | 86 +++++++++++++++++++ .../META-INF/MANIFEST.MF | 4 +- .../META-INF/spring/jcr.xml | 9 ++ .../META-INF/spring/maven.xml | 3 +- .../META-INF/spring/repo-osgi.xml | 3 +- runtime/org.argeo.slc.core/.classpath | 19 ++-- .../.settings/org.eclipse.pde.core.prefs | 3 +- .../.classpath | 2 +- runtime/org.argeo.slc.detached/.classpath | 2 +- runtime/org.argeo.slc.launcher/.classpath | 2 +- runtime/org.argeo.slc.lib.detached/.classpath | 2 +- runtime/org.argeo.slc.repo/.classpath | 1 + runtime/org.argeo.slc.repo/pom.xml | 6 ++ .../repo/maven/ImportMavenDependencies.java | 37 ++++---- .../resources/org/argeo/slc/repo/repo.cnd | 49 +++++++++++ runtime/org.argeo.slc.server/.classpath | 2 +- runtime/org.argeo.slc.specs/.classpath | 2 +- .../org.argeo.slc.support.activemq/.classpath | 2 +- .../build.properties | 3 +- runtime/org.argeo.slc.support.ant/.classpath | 2 +- .../org.argeo.slc.support.castor/.classpath | 20 ++--- .../org.argeo.slc.support.equinox/.classpath | 2 +- runtime/org.argeo.slc.support.gis/.classpath | 6 +- .../.classpath | 2 +- .../.settings/org.eclipse.pde.core.prefs | 3 + .../org.argeo.slc.support.hibernate/pom.xml | 2 +- runtime/org.argeo.slc.support.jcr/.classpath | 2 +- .../org.argeo.slc.support.jemmy/.classpath | 2 +- runtime/org.argeo.slc.support.osgi/.classpath | 2 +- .../org.argeo.slc.support.simple/.classpath | 2 +- runtime/org.argeo.slc.unit/.classpath | 2 +- 41 files changed, 308 insertions(+), 63 deletions(-) create mode 100644 modules/server/org.argeo.slc.server.jackrabbit.pgsql/.project create mode 100644 modules/server/org.argeo.slc.server.jackrabbit.pgsql/.settings/org.eclipse.pde.core.prefs create mode 100644 modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/MANIFEST.MF create mode 100644 modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit-osgi.xml create mode 100644 modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml create mode 100644 modules/server/org.argeo.slc.server.jackrabbit.pgsql/build.properties create mode 100644 modules/server/org.argeo.slc.server.jackrabbit.pgsql/jackrabbit.properties create mode 100644 modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml create mode 100644 modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml create mode 100644 runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd create mode 100644 runtime/org.argeo.slc.support.hibernate/.settings/org.eclipse.pde.core.prefs diff --git a/demo/slc_repo.properties b/demo/slc_repo.properties index fc4d90a5e..64b05a643 100644 --- 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 4cde85437..ed313d77f 100644 --- 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 @@ - diff --git a/dep/pom.xml b/dep/pom.xml index 4d5f11d4f..102886779 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -79,6 +79,9 @@ pde-sources generate-resources + + false + generate-descriptors 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 index 000000000..b29fe5aa7 --- /dev/null +++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/.project @@ -0,0 +1,22 @@ + + + org.argeo.slc.server.jackrabbit.pgsql + + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + + 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 index 000000000..9d3e03057 --- /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 index 000000000..0333a5506 --- /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 index 000000000..f6f4aed4e --- /dev/null +++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit-osgi.xml @@ -0,0 +1,11 @@ + + + + + + \ 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 index 000000000..39daf0f94 --- /dev/null +++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/spring/jackrabbit.xml @@ -0,0 +1,29 @@ + + + + + + + osgibundle:jackrabbit.properties + + + + + + + + + + + + + + + + + + + \ 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 index 000000000..5f22cdd44 --- /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 index 000000000..c25991a8e --- /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 index 000000000..f76929dc4 --- /dev/null +++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/repository.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 27347f2b5..54f7482a0 100644 --- 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 index 000000000..92b9c9437 --- /dev/null +++ b/modules/server/org.argeo.slc.server.repo/META-INF/spring/jcr.xml @@ -0,0 +1,9 @@ + + + + + + + \ 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 395a4edae..45fcf7bc8 100644 --- 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 @@ "> - + 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 b5987612c..aad718c86 100644 --- 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 http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd"> - + + - - - - - - - + + + + + + + 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 59b0c91ae..701feb44e 100644 --- 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 73ba12c2e..7430a31e5 100644 --- a/runtime/org.argeo.slc.detached.launcher/.classpath +++ b/runtime/org.argeo.slc.detached.launcher/.classpath @@ -4,5 +4,5 @@ - + diff --git a/runtime/org.argeo.slc.detached/.classpath b/runtime/org.argeo.slc.detached/.classpath index 73ba12c2e..7430a31e5 100644 --- a/runtime/org.argeo.slc.detached/.classpath +++ b/runtime/org.argeo.slc.detached/.classpath @@ -4,5 +4,5 @@ - + diff --git a/runtime/org.argeo.slc.launcher/.classpath b/runtime/org.argeo.slc.launcher/.classpath index 73ba12c2e..7430a31e5 100644 --- a/runtime/org.argeo.slc.launcher/.classpath +++ b/runtime/org.argeo.slc.launcher/.classpath @@ -4,5 +4,5 @@ - + diff --git a/runtime/org.argeo.slc.lib.detached/.classpath b/runtime/org.argeo.slc.lib.detached/.classpath index 110fd7f0b..ea37d3120 100644 --- a/runtime/org.argeo.slc.lib.detached/.classpath +++ b/runtime/org.argeo.slc.lib.detached/.classpath @@ -6,5 +6,5 @@ - + diff --git a/runtime/org.argeo.slc.repo/.classpath b/runtime/org.argeo.slc.repo/.classpath index 92f19d2ff..d3d5c8095 100644 --- a/runtime/org.argeo.slc.repo/.classpath +++ b/runtime/org.argeo.slc.repo/.classpath @@ -3,5 +3,6 @@ + diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml index 018e1cfd1..b92619459 100644 --- a/runtime/org.argeo.slc.repo/pom.xml +++ b/runtime/org.argeo.slc.repo/pom.xml @@ -27,6 +27,12 @@ + + org.argeo.commons.server + org.argeo.server.jcr + ${version.argeo-commons} + + org.argeo.slc.runtime org.argeo.slc.support.aether 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 8aff3de08..bf5d98ac9 100644 --- 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 excludedArtifacts = new HashSet(); + private Session jcrSession; + public void run() { + Set artifacts = resolveDistribution(); + } + + public Set 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 artifactComparator = new Comparator() { 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 artifacts) { + + } + /** Recursively adds non optional dependencies */ private void addDependencies(Set 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 index 000000000..c2e701924 --- /dev/null +++ b/runtime/org.argeo.slc.repo/src/main/resources/org/argeo/slc/repo/repo.cnd @@ -0,0 +1,49 @@ + + +[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 4ec9b5cb1..82e8c6774 100644 --- a/runtime/org.argeo.slc.server/.classpath +++ b/runtime/org.argeo.slc.server/.classpath @@ -5,5 +5,5 @@ - + diff --git a/runtime/org.argeo.slc.specs/.classpath b/runtime/org.argeo.slc.specs/.classpath index 8b978d9ed..b9f9fd2f3 100644 --- a/runtime/org.argeo.slc.specs/.classpath +++ b/runtime/org.argeo.slc.specs/.classpath @@ -1,6 +1,6 @@ - + diff --git a/runtime/org.argeo.slc.support.activemq/.classpath b/runtime/org.argeo.slc.support.activemq/.classpath index 73ba12c2e..7430a31e5 100644 --- a/runtime/org.argeo.slc.support.activemq/.classpath +++ b/runtime/org.argeo.slc.support.activemq/.classpath @@ -4,5 +4,5 @@ - + diff --git a/runtime/org.argeo.slc.support.activemq/build.properties b/runtime/org.argeo.slc.support.activemq/build.properties index 4453b0d9c..f0cc4f1b4 100644 --- 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 110fd7f0b..ea37d3120 100644 --- a/runtime/org.argeo.slc.support.ant/.classpath +++ b/runtime/org.argeo.slc.support.ant/.classpath @@ -6,5 +6,5 @@ - + diff --git a/runtime/org.argeo.slc.support.castor/.classpath b/runtime/org.argeo.slc.support.castor/.classpath index 16c8205a8..762e65304 100644 --- a/runtime/org.argeo.slc.support.castor/.classpath +++ b/runtime/org.argeo.slc.support.castor/.classpath @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/runtime/org.argeo.slc.support.equinox/.classpath b/runtime/org.argeo.slc.support.equinox/.classpath index 3e6ecf767..762e65304 100644 --- a/runtime/org.argeo.slc.support.equinox/.classpath +++ b/runtime/org.argeo.slc.support.equinox/.classpath @@ -6,5 +6,5 @@ - + diff --git a/runtime/org.argeo.slc.support.gis/.classpath b/runtime/org.argeo.slc.support.gis/.classpath index dff8aa650..f0a46691b 100644 --- a/runtime/org.argeo.slc.support.gis/.classpath +++ b/runtime/org.argeo.slc.support.gis/.classpath @@ -1,8 +1,8 @@ - - - + + + diff --git a/runtime/org.argeo.slc.support.hibernate/.classpath b/runtime/org.argeo.slc.support.hibernate/.classpath index 110fd7f0b..ea37d3120 100644 --- a/runtime/org.argeo.slc.support.hibernate/.classpath +++ b/runtime/org.argeo.slc.support.hibernate/.classpath @@ -6,5 +6,5 @@ - + 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 index 000000000..0572a4a46 --- /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 5d1705a1c..fafa6ffde 100644 --- a/runtime/org.argeo.slc.support.hibernate/pom.xml +++ b/runtime/org.argeo.slc.support.hibernate/pom.xml @@ -19,7 +19,7 @@ org.argeo.slc.core - *,org.hibernate.proxy,javassist.util.proxy + !org.argeo.slc.core.*,org.hibernate.proxy,javassist.util.proxy,* diff --git a/runtime/org.argeo.slc.support.jcr/.classpath b/runtime/org.argeo.slc.support.jcr/.classpath index 3e6ecf767..762e65304 100644 --- a/runtime/org.argeo.slc.support.jcr/.classpath +++ b/runtime/org.argeo.slc.support.jcr/.classpath @@ -6,5 +6,5 @@ - + diff --git a/runtime/org.argeo.slc.support.jemmy/.classpath b/runtime/org.argeo.slc.support.jemmy/.classpath index 90d9c1bfd..e7acc2254 100644 --- a/runtime/org.argeo.slc.support.jemmy/.classpath +++ b/runtime/org.argeo.slc.support.jemmy/.classpath @@ -6,5 +6,5 @@ - + diff --git a/runtime/org.argeo.slc.support.osgi/.classpath b/runtime/org.argeo.slc.support.osgi/.classpath index a0707243b..62daaabf5 100644 --- a/runtime/org.argeo.slc.support.osgi/.classpath +++ b/runtime/org.argeo.slc.support.osgi/.classpath @@ -6,5 +6,5 @@ - + diff --git a/runtime/org.argeo.slc.support.simple/.classpath b/runtime/org.argeo.slc.support.simple/.classpath index 75d303548..9633ef11f 100644 --- a/runtime/org.argeo.slc.support.simple/.classpath +++ b/runtime/org.argeo.slc.support.simple/.classpath @@ -5,5 +5,5 @@ - + diff --git a/runtime/org.argeo.slc.unit/.classpath b/runtime/org.argeo.slc.unit/.classpath index 110fd7f0b..ea37d3120 100644 --- a/runtime/org.argeo.slc.unit/.classpath +++ b/runtime/org.argeo.slc.unit/.classpath @@ -6,5 +6,5 @@ - + -- 2.39.2