Upgrade Equinox to 3.5
authorMathieu Baudier <mbaudier@argeo.org>
Sat, 26 Dec 2009 18:02:24 +0000 (18:02 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Sat, 26 Dec 2009 18:02:24 +0000 (18:02 +0000)
Clean up

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

18 files changed:
demo/.classpath
demo/init.ldif [deleted file]
demo/pom.xml
demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml
demo/site/org.argeo.slc.demo.det/META-INF/spring/det.xml
demo/src/test/java/org/argeo/slc/demo/StartStopDemoTest.java [deleted file]
demo/src/test/java/org/argeo/slc/demo/minimal/HelloWorldTest.java [deleted file]
demo/src/test/resources/log4j.properties [deleted file]
dep/org.argeo.slc.dep.agent/p2.inf [new file with mode: 0644]
dep/org.argeo.slc.dep.agent/pom.xml
dep/org.argeo.slc.dep.server/p2.inf [new file with mode: 0644]
dep/org.argeo.slc.dep.server/pom.xml
dep/pom.xml
dist/pom.xml [new file with mode: 0644]
dist/slc-sdk/pom.xml [new file with mode: 0644]
pom.xml
runtime/org.argeo.slc.support.castor/pom.xml
runtime/org.argeo.slc.support.simple/pom.xml

index 8fa9377c294338de73599e885df5117e29dd55bb..d0bec0f7611fdaeecb07a8dfbcc32e06ccda11cb 100644 (file)
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="output" path="target/classes"/>
diff --git a/demo/init.ldif b/demo/init.ldif
deleted file mode 100644 (file)
index 9fb8d4b..0000000
+++ /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
index 7b1d15b40e5d27e2202983a821e0f2931875e8f3..ba02d1727ea04621fab3f4ca236934d50541e8e8 100644 (file)
                                        </argsToAppend>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <includeScope>compile</includeScope>
-                                                       <includeTypes>jar</includeTypes>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <configuration>
-                                       <skipTests>true</skipTests>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>surefire-it</id>
-                                               <phase>integration-test</phase>
-                                               <goals>
-                                                       <goal>test</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <skipTests>false</skipTests>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
                </plugins>
        </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
-                       <artifactId>org.argeo.osgi.boot</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-
-               <!--
-                       Unit Tests <dependency> <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.unit</artifactId> <scope>test</scope>
-                       </dependency>
-               -->
-
-       </dependencies>
-
        <profiles>
                <profile>
                        <id>server</id>
                                        <artifactId>org.argeo.slc.ria</artifactId>
                                </dependency>
 
-                               <!-- Security -->
-                               <dependency>
-                                       <groupId>org.argeo.commons.security</groupId>
-                                       <artifactId>org.argeo.security.dep.ads</artifactId>
-                                       <version>${version.argeo-commons}</version>
-                                       <type>pom</type>
-                               </dependency>
                        </dependencies>
                </profile>
                <profile>
                                        <artifactId>org.argeo.slc.dep.agent</artifactId>
                                        <version>${project.version}</version>
                                </dependency>
-                               <dependency>
-                                       <groupId>org.argeo.slc.runtime</groupId>
-                                       <artifactId>org.argeo.slc.support.ant</artifactId>
-                                       <version>${project.version}</version>
-                               </dependency>
                        </dependencies>
                </profile>
                <profile>
                                <dependency>
                                        <groupId>org.eclipse.osgi</groupId>
                                        <artifactId>org.eclipse.osgi</artifactId>
-                                       <version>3.5.0.v20090311-1300</version>
-                               </dependency>
-                       </dependencies>
-               </profile>
-               <profile>
-                       <id>standalone</id>
-                       <build>
-                               <plugins>
-                                       <plugin>
-                                               <groupId>org.argeo.maven.plugins</groupId>
-                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                               <configuration>
-                                                       <execDir>target/exec/agent</execDir>
-                                                       <systemProperties>
-                                                               <argeo.osgi.start>
-                                                                       org.springframework.osgi.extender,
-                                                                       org.argeo.slc.support.equinox,
-                                                                       org.argeo.slc.agent
-                                                               </argeo.osgi.start>
-                                                               <argeo.osgi.bundles>
-                                                                       ${basedir}/site;in=*;ex=pom.xml;ex=target,
-                                                                       ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-                                                               </argeo.osgi.bundles>
-                                                       </systemProperties>
-                                               </configuration>
-                                       </plugin>
-                               </plugins>
-                       </build>
-                       <dependencies>
-                               <dependency>
-                                       <groupId>org.argeo.slc.dep</groupId>
-                                       <artifactId>org.argeo.slc.dep.agent</artifactId>
-                                       <version>${project.version}</version>
-                               </dependency>
-                               <dependency>
-                                       <groupId>org.argeo.slc.runtime</groupId>
-                                       <artifactId>org.argeo.slc.support.ant</artifactId>
-                                       <version>${project.version}</version>
                                </dependency>
                        </dependencies>
                </profile>
index 1f06d0ef89333265070622739b51b7b464b5a97b..0eda31f1096397e41f380eccb8445b38b40fd618 100644 (file)
@@ -11,7 +11,9 @@
        <bundle id="basic" symbolic-name="org.argeo.slc.demo.basic"
                action="start" />
        <bundle id="ant" symbolic-name="org.argeo.slc.demo.ant" action="start" />
-       <bundle id="detached" symbolic-name="org.argeo.slc.demo.detached"
-               action="start" />
-       <!-- <bundle id="det" symbolic-name="org.argeo.slc.demo.det" action="start" /> -->
+       <!--
+               <bundle id="detached" symbolic-name="org.argeo.slc.demo.detached"
+               action="start" /> <bundle id="det"
+               symbolic-name="org.argeo.slc.demo.det" action="start" />
+       -->
 </beans:beans>
\ No newline at end of file
index ca9398dcf3ea2ac1005b9c4a7ad03d93a473eb98..144b822c80e375aabd9435fc05810d2a7a352d42 100644 (file)
@@ -19,7 +19,7 @@
        <!-- Runtime -->
        <bean id="driver.detached" parent="slcTemplate.detached.fileDriver"
                init-method="start" destroy-method="stop">
-               <property name="baseDir" value="${user.dir}/local/detached" />
+               <property name="baseDir" value="${user.dir}/target/detached" />
                <property name="xmlConverter" ref="slcDefault.detached.xmlConverterCompat" />
                <property name="executionServer" ref="executionServer.serviceref" />
        </bean>
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 (file)
index c5e872e..0000000
+++ /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<String> getBundlesToStart() {
-               List<String> bundlesToStart = new ArrayList<String>();
-               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 (file)
index 96ad315..0000000
+++ /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 (file)
index 9572fad..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Set root logger level to DEBUG and its only appender to A1.\r
-log4j.rootLogger=WARN, console\r
-\r
-## Levels\r
-# Slc\r
-log4j.logger.org.argeo.slc=DEBUG\r
-log4j.logger.org.springframework=WARN\r
-\r
-## Appenders\r
-# A1 is set to be a ConsoleAppender.\r
-log4j.appender.console=org.apache.log4j.ConsoleAppender\r
-\r
-# A1 uses PatternLayout.\r
-log4j.appender.console.layout=org.apache.log4j.PatternLayout\r
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c %n\r
-\r
diff --git a/dep/org.argeo.slc.dep.agent/p2.inf b/dep/org.argeo.slc.dep.agent/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
index 03d8a530beff45e6aae339918543e140d8f65106..067c5ead9afce171726e186cf9010d70a8c794a5 100644 (file)
        <packaging>jar</packaging>
        <name>SLC Dependencies Agent</name>
        <dependencies>
+               <!--  Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+               </dependency>
+
+               <!-- SLC -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
@@ -32,8 +39,6 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
                </dependency>
-
-               <!-- Additional -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.ant</artifactId>
diff --git a/dep/org.argeo.slc.dep.server/p2.inf b/dep/org.argeo.slc.dep.server/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
@@ -0,0 +1,2 @@
+properties.1.name=org.eclipse.equinox.p2.type.category
+properties.1.value=true
\ No newline at end of file
index f3864c3e8cdea2fd85ab86e52a78490acc1836a7..e362c0612810429616ef913b0dbbaa9f75c8ddc0 100644 (file)
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.server</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.activemq</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.castor</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.hibernate</artifactId>
@@ -53,6 +45,7 @@
                        <version>${version.argeo-commons}</version>
                        <type>pom</type>
                </dependency>
+
                <!-- Security -->
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <groupId>com.mysql.jdbc</groupId>
                        <artifactId>com.springsource.com.mysql.jdbc</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.postgresql</groupId>
+                       <artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
+               </dependency>
 
                <!-- Required in JDK 1.5 -->
                <dependency>
index d82de3746d716a7cf91ececcd5a1772933d395e3..72efb82abef9cd36263da015ef0228e63df62e1a 100644 (file)
@@ -20,6 +20,7 @@
                        <resource>
                                <directory>.</directory>
                                <includes>
+                                       <include>*.inf</include>
                                        <include>META-INF/MANIFEST.MF</include>
                                </includes>
                        </resource>
diff --git a/dist/pom.xml b/dist/pom.xml
new file mode 100644 (file)
index 0000000..1bc8906
--- /dev/null
@@ -0,0 +1,16 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>argeo-slc</artifactId>
+               <version>0.12.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc</groupId>
+       <artifactId>dist</artifactId>
+       <packaging>pom</packaging>
+       <name>SLC Distribution</name>
+       <modules>
+               <module>slc-sdk</module>
+       </modules>
+</project>
\ No newline at end of file
diff --git a/dist/slc-sdk/pom.xml b/dist/slc-sdk/pom.xml
new file mode 100644 (file)
index 0000000..1450352
--- /dev/null
@@ -0,0 +1,84 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>dist</artifactId>
+               <version>0.12.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.dist</groupId>
+       <artifactId>slc-sdk</artifactId>
+       <packaging>pom</packaging>
+       <name>SLC SDK</name>
+       <properties>
+               <argeo.p2.cmd>/home/mbaudier/dev/tools/eclipse-rcp-galileo-SR1/eclipse</argeo.p2.cmd>
+               <argeo.p2.repository>/var/www/html/dev/slc/repository</argeo.p2.repository>
+       </properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>copy-dependencies</id>
+                                               <phase>process-resources</phase>
+                                               <goals>
+                                                       <goal>copy-dependencies</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <includeTypes>jar</includeTypes>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>exec-maven-plugin</artifactId>
+                               <version>1.1</version>
+                               <executions>
+                                       <execution>
+                                               <id>create-repository</id>
+                                               <phase>package</phase>
+                                               <goals>
+                                                       <goal>exec</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <executable>${argeo.p2.cmd}</executable>
+                                       <!-- optional -->
+                                       <workingDirectory>/tmp</workingDirectory>
+                                       <arguments>
+                                               <argument>-noSplash</argument>
+                                               <argument>-application</argument>
+                                               <argument>org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher</argument>
+                                               <argument>-metadataRepository</argument>
+                                               <argument>file:${argeo.p2.repository}</argument>
+                                               <argument>-artifactRepository</argument>
+                                               <argument>file:${argeo.p2.repository}</argument>
+                                               <argument>-bundles</argument>
+                                               <argument>${project.build.directory}/dependency</argument>
+                                               <argument>-features</argument>
+                                               <argument>${project.build.directory}/dependency</argument>
+                                               <argument>-compress</argument>
+                                               <argument>-publishArtifacts</argument>
+                                       </arguments>
+                               </configuration>
+                       </plugin>
+
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.dep.server</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.server</groupId>
+                       <artifactId>org.argeo.slc.ria</artifactId>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3822b9410870d00b3cc824eed0e026cf8bec1abc..cc92d1fe08bb6a3a24fe088075d0375452d6c9c5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,9 @@
                <developmentCycle>0.12</developmentCycle>
                <version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
                <version.argeo-commons>0.1.2-SNAPSHOT</version.argeo-commons>
-               <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
+               <version.equinox>3.5.1.R35x_v20090827</version.equinox>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-               <version.maven-argeo-osgi>0.1.23</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.24</version.maven-argeo-osgi>
                <version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
                <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
                <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
index e486f68eac183d1714028c29da6786ca1ecd7e02..95f3da15aeaf431515cf66a1bb3cd1ee36df32ad 100644 (file)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -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
                                                </Import-Package>
                                                <Fragment-Host>com.springsource.org.castor</Fragment-Host>
                                        </instructions>
index dde964eaf36a44a8532da398aa85c88cfea769bb..189a8da9f1747861339f63f569facdf3c39f5435 100644 (file)
                        <artifactId>com.springsource.javax.mail</artifactId>
                </dependency>
 
+               <!-- SVN -->
+               <dependency>
+                       <groupId>com.svnkit</groupId>
+                       <artifactId>com.springsource.org.tmatesoft.svn</artifactId>
+               </dependency>
+
                <!-- TODO: check if necessary here -->
                <dependency>
                        <groupId>org.springframework</groupId>