From: Mathieu Baudier Date: Sat, 26 Dec 2009 18:02:24 +0000 (+0000) Subject: Upgrade Equinox to 3.5 X-Git-Tag: argeo-slc-2.1.7~1505 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=834c7cc205601ef011c512dcd49bd3c9cb09abd7;p=gpl%2Fargeo-slc.git Upgrade Equinox to 3.5 Clean up git-svn-id: https://svn.argeo.org/slc/trunk@3199 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/demo/.classpath b/demo/.classpath index 8fa9377c2..d0bec0f76 100644 --- a/demo/.classpath +++ b/demo/.classpath @@ -1,7 +1,5 @@ - - diff --git a/demo/init.ldif b/demo/init.ldif deleted file mode 100644 index 9fb8d4b6f..000000000 --- a/demo/init.ldif +++ /dev/null @@ -1,74 +0,0 @@ -dn: dc=demo,dc=argeo,dc=org -objectClass: domain -objectClass: extensibleObject -objectClass: top -dc: springsecurity - -dn: ou=groups,dc=demo,dc=argeo,dc=org -objectClass: organizationalUnit -objectClass: top -ou: groups - -dn: ou=users,dc=demo,dc=argeo,dc=org -objectClass: organizationalUnit -objectClass: top -ou: users - -dn: uid=demo,ou=users,dc=demo,dc=argeo,dc=org -objectClass: organizationalPerson -objectClass: person -objectClass: inetOrgPerson -objectClass: top -cn: demo User -description: Demo user -givenname: Demo -mail: demo@localhost -sn: User -uid: demo -userpassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 - -dn: uid=root,ou=users,dc=demo,dc=argeo,dc=org -objectClass: person -objectClass: inetOrgPerson -objectClass: organizationalPerson -objectClass: top -cn: demo User -description: Superuser -givenname: Root -mail: root@localhost -sn: Root -uid: root -userpassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 - -dn: uid=frodo,ou=users,dc=demo,dc=argeo,dc=org -objectClass: person -objectClass: inetOrgPerson -objectClass: organizationalPerson -objectClass: top -cn: demo User -description: Heroe -givenname: Frodo -mail: frodo@localhost -sn: User -uid: frodo -userpassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 - -dn: uid=gandalf,ou=users,dc=demo,dc=argeo,dc=org -objectClass: organizationalPerson -objectClass: person -objectClass: inetOrgPerson -objectClass: top -cn: root User -description: Superuser -givenname: Gandalf -mail: admin@localhost -sn: User -uid: gandalf -userpassword:: e1NIQX1pZVNWNTVRYytlUU9hWURSU2hhL0Fqek5USkU9 - -dn: cn=admin,ou=groups,dc=demo,dc=argeo,dc=org -objectClass: groupOfUniqueNames -objectClass: top -cn: admin -uniquemember: uid=gandalf,ou=users,dc=demo,dc=argeo,dc=org -uniquemember: uid=root,ou=users,dc=demo,dc=argeo,dc=org diff --git a/demo/pom.xml b/demo/pom.xml index 7b1d15b40..ba02d1727 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -26,59 +26,8 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - pre-integration-test - - copy-dependencies - - - compile - jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - surefire-it - integration-test - - test - - - false - - - - - - - org.argeo.commons.osgi - org.argeo.osgi.boot - ${version.argeo-commons} - - - - - - server @@ -118,13 +67,6 @@ org.argeo.slc.ria - - - org.argeo.commons.security - org.argeo.security.dep.ads - ${version.argeo-commons} - pom - @@ -158,11 +100,6 @@ org.argeo.slc.dep.agent ${project.version} - - org.argeo.slc.runtime - org.argeo.slc.support.ant - ${project.version} - @@ -204,44 +141,6 @@ org.eclipse.osgi org.eclipse.osgi - 3.5.0.v20090311-1300 - - - - - standalone - - - - org.argeo.maven.plugins - maven-argeo-osgi-plugin - - target/exec/agent - - - org.springframework.osgi.extender, - org.argeo.slc.support.equinox, - org.argeo.slc.agent - - - ${basedir}/site;in=*;ex=pom.xml;ex=target, - ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target - - - - - - - - - org.argeo.slc.dep - org.argeo.slc.dep.agent - ${project.version} - - - org.argeo.slc.runtime - org.argeo.slc.support.ant - ${project.version} diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml index 1f06d0ef8..0eda31f10 100644 --- a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml +++ b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml @@ -11,7 +11,9 @@ - - + \ No newline at end of file diff --git a/demo/site/org.argeo.slc.demo.det/META-INF/spring/det.xml b/demo/site/org.argeo.slc.demo.det/META-INF/spring/det.xml index ca9398dcf..144b822c8 100644 --- a/demo/site/org.argeo.slc.demo.det/META-INF/spring/det.xml +++ b/demo/site/org.argeo.slc.demo.det/META-INF/spring/det.xml @@ -19,7 +19,7 @@ - + diff --git a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java b/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java deleted file mode 100644 index c5e872ec8..000000000 --- a/demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.argeo.slc.demo; - - -public class StartStopDemoTest {//extends AbstractOsgiRuntimeTestCase { -/* - public void testStartStop() throws Exception { - assertBundleApplicationContext("org.argeo.slc.agent"); - assertStartedBundlesApplicationContext("org.argeo.slc.demo"); - } - - protected void installBundles() throws Exception { - // osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, - // "target/dependency;in=*.jar")); - osgiBoot.installUrls(osgiBoot.getLocationsUrls( - OsgiBoot.DEFAULT_BASE_URL, System - .getProperty("java.class.path"))); - osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, - "site;in=*")); - osgiBoot.installUrls(osgiBoot.getBundlesUrls(OsgiBoot.DEFAULT_BASE_URL, - "../server/org.argeo.slc.siteserver/bundles;in=*")); - } - - protected List getBundlesToStart() { - List bundlesToStart = new ArrayList(); - bundlesToStart.add("org.springframework.osgi.extender"); - bundlesToStart.add("org.argeo.slc.agent"); - bundlesToStart.add("org.argeo.slc.demo.basic"); - return bundlesToStart; - }*/ - -} diff --git a/demo/src/test/java/org/argeo/slc/demo/minimal/HelloWorldTest.java b/demo/src/test/java/org/argeo/slc/demo/minimal/HelloWorldTest.java deleted file mode 100644 index 96ad31549..000000000 --- a/demo/src/test/java/org/argeo/slc/demo/minimal/HelloWorldTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.argeo.slc.demo.minimal; - - -public class HelloWorldTest {// extends TestCase { -/* public void testHelloWorld() throws Exception { - GenericBeanFactoryAccessor context = new GenericBeanFactoryAccessor( - createContext()); - ExecutionFlow flow = context.getBean("main"); - flow.run(); - } - - protected ConfigurableApplicationContext createContext() { - String[] locations = { "site/org.argeo.slc.demo.groovy/slc/main.xml", - "site/org.argeo.slc.demo.groovy/slc/imports.xml" }; - FileSystemXmlApplicationContext context = new FileSystemXmlApplicationContext( - locations); - return context; - } -*/ -} diff --git a/demo/src/test/resources/log4j.properties b/demo/src/test/resources/log4j.properties deleted file mode 100644 index 9572fad6c..000000000 --- a/demo/src/test/resources/log4j.properties +++ /dev/null @@ -1,16 +0,0 @@ -# Set root logger level to DEBUG and its only appender to A1. -log4j.rootLogger=WARN, console - -## Levels -# Slc -log4j.logger.org.argeo.slc=DEBUG -log4j.logger.org.springframework=WARN - -## Appenders -# A1 is set to be a ConsoleAppender. -log4j.appender.console=org.apache.log4j.ConsoleAppender - -# A1 uses PatternLayout. -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %n - diff --git a/dep/org.argeo.slc.dep.agent/p2.inf b/dep/org.argeo.slc.dep.agent/p2.inf new file mode 100644 index 000000000..0423aa509 --- /dev/null +++ b/dep/org.argeo.slc.dep.agent/p2.inf @@ -0,0 +1,2 @@ +properties.1.name=org.eclipse.equinox.p2.type.category +properties.1.value=true \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml index 03d8a530b..067c5ead9 100644 --- a/dep/org.argeo.slc.dep.agent/pom.xml +++ b/dep/org.argeo.slc.dep.agent/pom.xml @@ -12,6 +12,13 @@ jar SLC Dependencies Agent + + + org.argeo.commons.osgi + org.argeo.osgi.boot + + + org.argeo.slc.runtime org.argeo.slc.core @@ -32,8 +39,6 @@ org.argeo.slc.runtime org.argeo.slc.support.castor - - org.argeo.slc.runtime org.argeo.slc.support.ant diff --git a/dep/org.argeo.slc.dep.server/p2.inf b/dep/org.argeo.slc.dep.server/p2.inf new file mode 100644 index 000000000..0423aa509 --- /dev/null +++ b/dep/org.argeo.slc.dep.server/p2.inf @@ -0,0 +1,2 @@ +properties.1.name=org.eclipse.equinox.p2.type.category +properties.1.value=true \ No newline at end of file diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml index f3864c3e8..e362c0612 100644 --- a/dep/org.argeo.slc.dep.server/pom.xml +++ b/dep/org.argeo.slc.dep.server/pom.xml @@ -29,14 +29,6 @@ org.argeo.slc.runtime org.argeo.slc.server - - org.argeo.slc.runtime - org.argeo.slc.support.activemq - - - org.argeo.slc.runtime - org.argeo.slc.support.castor - org.argeo.slc.runtime org.argeo.slc.support.hibernate @@ -53,6 +45,7 @@ ${version.argeo-commons} pom + org.argeo.commons.security @@ -138,6 +131,10 @@ com.mysql.jdbc com.springsource.com.mysql.jdbc + + org.postgresql + com.springsource.org.postgresql.jdbc3 + diff --git a/dep/pom.xml b/dep/pom.xml index d82de3746..72efb82ab 100644 --- a/dep/pom.xml +++ b/dep/pom.xml @@ -20,6 +20,7 @@ . + *.inf META-INF/MANIFEST.MF diff --git a/dist/pom.xml b/dist/pom.xml new file mode 100644 index 000000000..1bc8906cc --- /dev/null +++ b/dist/pom.xml @@ -0,0 +1,16 @@ + + 4.0.0 + + org.argeo.slc + argeo-slc + 0.12.1-SNAPSHOT + .. + + org.argeo.slc + dist + pom + SLC Distribution + + slc-sdk + + \ No newline at end of file diff --git a/dist/slc-sdk/pom.xml b/dist/slc-sdk/pom.xml new file mode 100644 index 000000000..1450352be --- /dev/null +++ b/dist/slc-sdk/pom.xml @@ -0,0 +1,84 @@ + + 4.0.0 + + org.argeo.slc + dist + 0.12.1-SNAPSHOT + .. + + org.argeo.slc.dist + slc-sdk + pom + SLC SDK + + /home/mbaudier/dev/tools/eclipse-rcp-galileo-SR1/eclipse + /var/www/html/dev/slc/repository + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + process-resources + + copy-dependencies + + + jar + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.1 + + + create-repository + package + + exec + + + + + ${argeo.p2.cmd} + + /tmp + + -noSplash + -application + org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher + -metadataRepository + file:${argeo.p2.repository} + -artifactRepository + file:${argeo.p2.repository} + -bundles + ${project.build.directory}/dependency + -features + ${project.build.directory}/dependency + -compress + -publishArtifacts + + + + + + + + + org.argeo.slc.dep + org.argeo.slc.dep.server + ${project.version} + + + org.argeo.slc.server + org.argeo.slc.ria + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3822b9410..cc92d1fe0 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,9 @@ 0.12 0.12.2-SNAPSHOT 0.1.2-SNAPSHOT - 3.4.2.R34x_v20080826-1230 + 3.5.1.R35x_v20090827 2.0.0 - 0.1.23 + 0.1.24 0.8.2.1 file:///var/argeo/projects/SLC/www/site http://www.argeo.org/projects/slc/site diff --git a/runtime/org.argeo.slc.support.castor/pom.xml b/runtime/org.argeo.slc.support.castor/pom.xml index e486f68ea..95f3da15a 100644 --- a/runtime/org.argeo.slc.support.castor/pom.xml +++ b/runtime/org.argeo.slc.support.castor/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -54,7 +55,9 @@ org.argeo.slc.msg.test.tree;resolution:=optional, org.argeo.slc.detached;resolution:=optional, org.apache.xml.serialize;resolution:=optional, - org.apache.xerces.jaxp;resolution:=optional + org.apache.xerces.jaxp;resolution:=optional, + javax.naming;resolution:=optional, + javax.naming.directory;resolution:=optional com.springsource.org.castor diff --git a/runtime/org.argeo.slc.support.simple/pom.xml b/runtime/org.argeo.slc.support.simple/pom.xml index dde964eaf..189a8da9f 100644 --- a/runtime/org.argeo.slc.support.simple/pom.xml +++ b/runtime/org.argeo.slc.support.simple/pom.xml @@ -86,6 +86,12 @@ com.springsource.javax.mail + + + com.svnkit + com.springsource.org.tmatesoft.svn + + org.springframework