]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Restructure SLC development environment
authorMathieu Baudier <mbaudier@argeo.org>
Mon, 15 Feb 2010 19:27:53 +0000 (19:27 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Mon, 15 Feb 2010 19:27:53 +0000 (19:27 +0000)
Introduce JCR support

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

73 files changed:
demo/agent.properties [new file with mode: 0644]
demo/server.properties [new file with mode: 0644]
dep/org.argeo.slc.dep.agent/pom.xml
eclipse/plugins/org.argeo.slc.ide.ui/src/main/java/org/argeo/slc/ide/ui/launch/osgi/OsgiBootEquinoxLaunchConfiguration.java
pom.xml
runtime/org.argeo.slc.core/pom.xml
runtime/org.argeo.slc.detached.launcher/.classpath
runtime/org.argeo.slc.detached.launcher/.project
runtime/org.argeo.slc.detached.launcher/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.detached.launcher/pom.xml
runtime/org.argeo.slc.detached/.classpath
runtime/org.argeo.slc.detached/.project
runtime/org.argeo.slc.detached/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.detached/pom.xml
runtime/org.argeo.slc.launcher/.classpath
runtime/org.argeo.slc.launcher/.project
runtime/org.argeo.slc.launcher/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.launcher/pom.xml
runtime/org.argeo.slc.lib.detached/.classpath
runtime/org.argeo.slc.lib.detached/.project
runtime/org.argeo.slc.lib.detached/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.lib.detached/pom.xml
runtime/org.argeo.slc.osgiboot/.classpath
runtime/org.argeo.slc.osgiboot/.project
runtime/org.argeo.slc.osgiboot/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.osgiboot/pom.xml
runtime/org.argeo.slc.server/.classpath
runtime/org.argeo.slc.server/.project
runtime/org.argeo.slc.server/pom.xml
runtime/org.argeo.slc.specs/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.specs/pom.xml
runtime/org.argeo.slc.support.activemq/.classpath
runtime/org.argeo.slc.support.activemq/.project
runtime/org.argeo.slc.support.activemq/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.support.activemq/pom.xml
runtime/org.argeo.slc.support.ant/.classpath
runtime/org.argeo.slc.support.ant/.project
runtime/org.argeo.slc.support.ant/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.support.ant/pom.xml
runtime/org.argeo.slc.support.castor/.classpath
runtime/org.argeo.slc.support.castor/.project
runtime/org.argeo.slc.support.castor/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.support.castor/pom.xml
runtime/org.argeo.slc.support.equinox/.classpath
runtime/org.argeo.slc.support.equinox/.project
runtime/org.argeo.slc.support.equinox/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.support.equinox/pom.xml
runtime/org.argeo.slc.support.equinox/src/main/java/org/argeo/slc/equinox/ExecutionCommandProvider.java
runtime/org.argeo.slc.support.hibernate/.classpath
runtime/org.argeo.slc.support.hibernate/.project
runtime/org.argeo.slc.support.hibernate/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.support.hibernate/pom.xml
runtime/org.argeo.slc.support.jcr/.classpath
runtime/org.argeo.slc.support.jcr/.project
runtime/org.argeo.slc.support.jcr/pom.xml [new file with mode: 0644]
runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/process/SlcExecutionDaoJcr.java [new file with mode: 0644]
runtime/org.argeo.slc.support.jemmy/.classpath
runtime/org.argeo.slc.support.jemmy/.project
runtime/org.argeo.slc.support.jemmy/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.support.jemmy/pom.xml
runtime/org.argeo.slc.support.maven/pom.xml
runtime/org.argeo.slc.support.osgi/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.support.osgi/pom.xml
runtime/org.argeo.slc.support.simple/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.support.simple/pom.xml
runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/lib/svn/SvnKitDriver.java
runtime/org.argeo.slc.support.ws.client/pom.xml
runtime/org.argeo.slc.unit/.classpath
runtime/org.argeo.slc.unit/.project
runtime/org.argeo.slc.unit/build.properties [new file with mode: 0644]
runtime/org.argeo.slc.unit/pom.xml
runtime/org.argeo.slc.unit/src/main/java/org/argeo/slc/equinox/unit/AbstractOsgiRuntimeTestCase.java
runtime/pom.xml

diff --git a/demo/agent.properties b/demo/agent.properties
new file mode 100644 (file)
index 0000000..6df488a
--- /dev/null
@@ -0,0 +1,5 @@
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+org.argeo.slc.support.equinox,\
+org.argeo.slc.agent,\
+org.argeo.slc.agent.jms
diff --git a/demo/server.properties b/demo/server.properties
new file mode 100644 (file)
index 0000000..a05439d
--- /dev/null
@@ -0,0 +1,6 @@
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+org.argeo.server.ads.server,\
+org.argeo.slc.server.hsqldb,\
+org.argeo.slc.server.main,\
+org.argeo.slc.ria
index 4cdcbff1b9679c207a36587c20b59b984ec42473..576f39a96feb9d7a3c513d1e4613f346de7bbd03 100644 (file)
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.ant</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.jcr</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.lib.detached</artifactId>
index 6f2a93d3ce154b5048460aba5d032d7f75a44d1b..e619e44f13fa89354ac1b5c4ced5f3e4c7092a8e 100644 (file)
@@ -34,8 +34,10 @@ public class OsgiBootEquinoxLaunchConfiguration extends
                // refresh resources
 
                IFile propertiesFile = (IFile) configuration.getMappedResources()[0];
-               propertiesFile.getProject().refreshLocal(IResource.DEPTH_INFINITE,
+               propertiesFile.getParent().refreshLocal(IResource.DEPTH_INFINITE,
                                monitor);
+//             propertiesFile.getProject().refreshLocal(IResource.DEPTH_INFINITE,
+//                             monitor);
        }
 
        @Override
diff --git a/pom.xml b/pom.xml
index 115736d135923ba7c48517c7a9f06c4466264ea4..0b37769d23f193ec718250cc475abae8d6118c3e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -262,6 +262,11 @@ limitations under the License.
                                <artifactId>org.argeo.slc.support.activemq</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.jcr</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.server</artifactId>
index 982595c95d220565936ca528cfdff0ef0f404384..f4261b306d8cb7413c96e783619a4c5bb5747221 100644 (file)
        <description>Basic implementations of SLC Specifications</description>
        <build>
                <outputDirectory>bin</outputDirectory>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>META-INF/**</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
                                        <instructions>
                                                <Export-Package>
                                                        org.argeo.slc.*,org.argeo.slc.core.test.spring
@@ -67,7 +34,6 @@
                                        </instructions>
                                </configuration>
                        </plugin>
-
                </plugins>
        </build>
        <dependencies>
index b606f1820e907cbf70956b7b84a8f05e10ba7e9b..73ba12c2eada5b5a04bc37083084a28b61fb6272 100644 (file)
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <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"/>
 </classpath>
index 9c83d32f83557642905634ec9353f031d1e83892..d8fefa2520df6ea82485e911a5365969120e6bec 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.detached.launcher/build.properties b/runtime/org.argeo.slc.detached.launcher/build.properties
new file mode 100644 (file)
index 0000000..f0cc4f1
--- /dev/null
@@ -0,0 +1,2 @@
+source.. = src/main/java/,\
+           src/main/resources/
index 0e5edbd1f61841e1ab6ae79330d90d77905f2166..47d727d391e830392eb0ac8cb03fabdc036112ac 100644 (file)
                                        <target>1.4</target>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jar-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
+                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
                                                <Export-Package>
                                                        org.argeo.slc.*
                                                </Export-Package>
                                        </instructions>
                                </configuration>
                        </plugin>
-                       <!--
-                               <plugin> <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-assembly-plugin</artifactId> <configuration>
-                               <descriptors> <descriptor>src/assembly/dist.xml</descriptor>
-                               </descriptors> </configuration> <executions> <execution>
-                               <id>attach-assembly</id> <phase>package</phase> <goals>
-                               <goal>single</goal> </goals> </execution> </executions> </plugin>
-                       -->
                </plugins>
        </build>
        <dependencies>
                        <groupId>org.eclipse.osgi</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
                </dependency>
-
-               <!--
-                       <dependency> <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.extender</artifactId>
-                       </dependency> <dependency> <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.detached</artifactId> </dependency>
-               -->
        </dependencies>
 </project>
\ No newline at end of file
index b606f1820e907cbf70956b7b84a8f05e10ba7e9b..73ba12c2eada5b5a04bc37083084a28b61fb6272 100644 (file)
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <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"/>
 </classpath>
index 5757ba7363770d9465fc7ad55353a32bda6497e0..32df2c3eb40432b1fd8f2525a234ac408977f566 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.detached/build.properties b/runtime/org.argeo.slc.detached/build.properties
new file mode 100644 (file)
index 0000000..f0cc4f1
--- /dev/null
@@ -0,0 +1,2 @@
+source.. = src/main/java/,\
+           src/main/resources/
index 212b28219fefe08608e3f7d4e9a052fcd386dc7b..27dce8ed0f7c58c9312f0fab684637c9911d32fc 100644 (file)
        <build>
                <plugins>
                        <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-compiler-plugin</artifactId>
+                               <configuration>
+                                       <source>1.4</source>
+                                       <target>1.4</target>
+                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
@@ -21,6 +26,7 @@
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
+                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
                                                <Export-Package>
                                                        org.argeo.slc.detached.*
                                                </Export-Package>
                                                        org.springframework.core,
                                                        *
                                                </Import-Package>
-                                               <!--
-                                                       <Import-Package> org.w3c.dom;version="0.0.0",
-                                                       javax.xml.*;version="0.0.0", org.apache.xerces.jaxp,
-                                                       org.springframework.beans.factory;version="2.0",
-                                                       org.springframework.beans.factory.support;version="2.0",
-                                                       org.springframework.beans.factory.xml;version="2.0",
-                                                       org.springframework.context;version="2.0",
-                                                       org.springframework.context.support;version="2.0",
-                                                       org.springframework.core.io;version="2.0", * </Import-Package>
-                                                       <Spring-Context>*;create-asynchronously:=false</Spring-Context>
-                                               -->
                                        </instructions>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.4</source>
-                                       <target>1.4</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
                </plugins>
        </build>
        <dependencies>
                        <groupId>edu.emory.mathcs.backport</groupId>
                        <artifactId>com.springsource.edu.emory.mathcs.backport</artifactId>
                </dependency>
-
-
-               <!--
-                       <dependency> <groupId>org.apache.xerces</groupId>
-                       <artifactId>com.springsource.org.apache.xerces</artifactId>
-                       </dependency>
-               -->
-
                <dependency>
                        <groupId>org.apache.xmlcommons</groupId>
                        <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
                        <scope>provided</scope>
                </dependency>
-               <!--
-                       <dependency> <groupId>xml-apis</groupId>
-                       <artifactId>xml-apis</artifactId> <version>1.3.04</version>
-                       <scope>provided</scope> </dependency>
-               -->
-
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>
index 036412180032fdfb3d068ef15367347cc06ca749..73ba12c2eada5b5a04bc37083084a28b61fb6272 100644 (file)
@@ -3,6 +3,6 @@
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>
index 6aa81d06fb7e02c6e53cbaba51fed0b04d738ea8..7254f6d9bab6d5a546591ddd7841a22de2cce2ca 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.launcher/build.properties b/runtime/org.argeo.slc.launcher/build.properties
new file mode 100644 (file)
index 0000000..7aa34da
--- /dev/null
@@ -0,0 +1,3 @@
+additional.bundles = org.springframework.xml
+source.. = src/main/java/,\
+           src/main/resources/
index 0fca99b0957e959644eb07f41e138b847a08974f..192710b8f1b641e10c1fe43acc05a3c873abd914 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>
        <name>SLC Launcher</name>
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-assembly-plugin</artifactId>
                                                <Export-Package>
                                                        org.argeo.slc.*
                                                </Export-Package>
-                                               <Import-Package>org.w3c.dom;version="0.0.0",javax.xml.*;version="0.0.0",*</Import-Package>
+                                               <Import-Package>
+                                                       org.w3c.dom;version="0.0.0",
+                                                       javax.xml.*;version="0.0.0",
+                                                       org.argeo.slc.build,
+                                                       *
+                                                </Import-Package>
                                                <Main-Class>org.argeo.slc.cli.SlcMain</Main-Class>
                                        </instructions>
                                </configuration>
index 9653ef0ac65d46aeb55b97fc2273c071f8ec4f1b..110fd7f0b1110a8a65097dcfb44037afd6ad6938 100644 (file)
@@ -5,6 +5,6 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
        <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r
index e7f6aa3dc92e54563f3c8d9b9e8c4280fe4935af..14fead3022fcc4f31633d3a31343b6a44b0a8cb7 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.lib.detached/build.properties b/runtime/org.argeo.slc.lib.detached/build.properties
new file mode 100644 (file)
index 0000000..f7b1a68
--- /dev/null
@@ -0,0 +1,7 @@
+additional.bundles = org.springframework.xml,\
+                     org.argeo.slc.unit,\
+                     com.springsource.junit
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index cb09fde2e0684a7995bb4617ddab66cbb5e5dbe4..aa9b10d70dca0b7057b7e90a57f2c6be8dc3a326 100644 (file)
        <name>SLC Lib Detached</name>
        <build>
                <plugins>
-                       <!-- Look to parent pom for inheritances -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
index 05a2e8f84a894dcd6505c19ac9dcfc5d67f53753..620713201ae180d14b2ecf19bc55143ec4af1f95 100644 (file)
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>
index 5a646e1b0276ea3553dd6021fd534ffd6271230b..891fbe7a17a3df7d4ace80b3d82aafb1f0f5a933 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.osgiboot/build.properties b/runtime/org.argeo.slc.osgiboot/build.properties
new file mode 100644 (file)
index 0000000..c4970c8
--- /dev/null
@@ -0,0 +1,3 @@
+additional.bundles = com.springsource.junit
+source.. = src/main/java/,\
+           src/test/java/
index c2dedb5d698855e6362ff1f1e632ee97264ee0d6..ab5e9374e8400fdc3e756882e96d2df7a577873f 100644 (file)
                                        <target>1.4</target>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <!-- 
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <configuration>
-                                       <descriptors>
-                                               <descriptor>src/assembly/osgiboot.xml</descriptor>
-                                       </descriptors>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>assembly-osgiboot</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                        -->
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
+                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
                                                <Bundle-Activator>org.argeo.slc.osgiboot.Activator</Bundle-Activator>
                                        </instructions>
                                </configuration>
                        </plugin>
-                       <!-- 
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
-                               <version>1.1</version>
-                               <executions>
-                                       <execution>
-                                               <id>attach-artifacts</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>attach-artifact</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <artifacts>
-                                                               <artifact>
-                                                                       <file>src/main/ant/osgiboot.xml</file>
-                                                                       <type>xml</type>
-                                                                       <classifier>osgiboot</classifier>
-                                                               </artifact>
-                                                       </artifacts>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
- -->
                </plugins>
        </build>
        <dependencies>
index 9653ef0ac65d46aeb55b97fc2273c071f8ec4f1b..110fd7f0b1110a8a65097dcfb44037afd6ad6938 100644 (file)
@@ -5,6 +5,6 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
        <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r
index 6638962114578e2f3b74827935d112c32e9ed4fd..278b92daa71cad58a74811b0784a81f5a5cc3045 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.springframework.ide.eclipse.core.springbuilder</name>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
-               <nature>org.springframework.ide.eclipse.core.springnature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
index a083abb980ce3f703b03ed17b4be84f32a8a139e..96897ff94a67f3379b5e6e397a393e1a1cfd22f2 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>
        <description>SLC Server</description>
        <build>
                <plugins>
-                       <!-- Look to parent pom for inheritances -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <!--
-                                       <executions> <execution> <goals> <goal>test-jar</goal> </goals>
-                                       </execution> </executions>
-                               -->
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                                <Export-Package>
                                                        org.argeo.slc.*,org.argeo.slc.server,org.argeo.slc.server.spring
                                                </Export-Package>
-                                               <Import-Package>org.w3c.dom;version="0.0.0",javax.xml.*;version="0.0.0",org.argeo.slc.activemq,org.argeo.slc.execution,*</Import-Package>
+                                               <Import-Package>org.w3c.dom;version="0.0.0",
+                                                       javax.xml.*;version="0.0.0",
+                                                       org.argeo.slc.activemq,
+                                                       org.argeo.slc.execution,
+                                                       org.springframework.context.support,
+                                                       *
+                                               </Import-Package>
                                        </instructions>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.mortbay.jetty</groupId>
-                               <artifactId>maven-jetty-plugin</artifactId>
-                               <configuration>
-                                       <webAppSourceDirectory>
-                                               ../../org.argeo.slc.webapp/src/main/webapp
-                                       </webAppSourceDirectory>
-                                       <jettyConfig>
-                                               ../../org.argeo.slc.webapp/src/main/config/jetty/jetty-test-local.xml
-                                       </jettyConfig>
-                                       <webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-                                       <systemProperties>
-                                               <systemProperty>
-                                                       <name>activemq.base</name>
-                                                       <value>${user.home}/share/apache-activemq-5.2.0</value>
-                                               </systemProperty>
-                                       </systemProperties>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
        <dependencies>
diff --git a/runtime/org.argeo.slc.specs/build.properties b/runtime/org.argeo.slc.specs/build.properties
new file mode 100644 (file)
index 0000000..f0c20ab
--- /dev/null
@@ -0,0 +1,2 @@
+source.. = src/main/java/,\
+           src/main/resources/
\ No newline at end of file
index 1e7be8b6b5a0a5d4420cacdb1a975d15118d6d7e..cb4b8711827af8ce13da9ba2c6ce06f6f955cffc 100644 (file)
        <artifactId>org.argeo.slc.specs</artifactId>
        <name>SLC Specifications</name>
        <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>META-INF/**</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
                                        <instructions>
                                                <Export-Package>
                                                        org.argeo.slc.*
@@ -56,9 +27,6 @@
                                        </instructions>
                                </configuration>
                        </plugin>
-
                </plugins>
        </build>
-       <dependencies>
-       </dependencies>
 </project>
\ No newline at end of file
index 30baf1326015b0e1e881c9009d643374adafa6e4..73ba12c2eada5b5a04bc37083084a28b61fb6272 100644 (file)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="src" path="src/main/resources"/>
+       <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>
index 42053e34a5eca3754005eca048ef1dcb42ef0da2..c1292c0e6eae1bc32c1e874c5e09ab3b92313102 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.activemq/build.properties b/runtime/org.argeo.slc.support.activemq/build.properties
new file mode 100644 (file)
index 0000000..f0cc4f1
--- /dev/null
@@ -0,0 +1,2 @@
+source.. = src/main/java/,\
+           src/main/resources/
index 0782ee9ec4f92d62bb2be5b613aa08191cf3085b..a71a0611f36e363433c991839937c5d4d022c83b 100644 (file)
        <name>SLC Support ActiveMQ</name>
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.activemq.optional</artifactId>
                </dependency>
-               <!-- 
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq.xmpp</artifactId>
-               </dependency>
-                -->
                <dependency>
                        <groupId>org.apache.activemq</groupId>
                        <artifactId>com.springsource.org.apache.activemq.pool</artifactId>
index 9653ef0ac65d46aeb55b97fc2273c071f8ec4f1b..110fd7f0b1110a8a65097dcfb44037afd6ad6938 100644 (file)
@@ -5,6 +5,6 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
        <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r
index 75a122a3ee0808ff66f43a2d57659d5555bdd071..51538fef0621bcfbec7fdbaba0bf55a501b0429b 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.ant/build.properties b/runtime/org.argeo.slc.support.ant/build.properties
new file mode 100644 (file)
index 0000000..7c51e9e
--- /dev/null
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index b880a0ceed1b023fbeaa9e92afa98d4c8f579ab9..8bda690f0831f6cc1bd8cda5a30cc4813080d6ad 100644 (file)
        <name>SLC Support Ant</name>
        <build>
                <plugins>
-                       <!-- Look to parent pom for inheritances -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
index 9653ef0ac65d46aeb55b97fc2273c071f8ec4f1b..110fd7f0b1110a8a65097dcfb44037afd6ad6938 100644 (file)
@@ -5,6 +5,6 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
        <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r
index 6cff3525a0c42b13e800718c8f154704eae0bbba..c0bc103ddd237a11a784227dc53b239267bcb1aa 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.castor/build.properties b/runtime/org.argeo.slc.support.castor/build.properties
new file mode 100644 (file)
index 0000000..92bb452
--- /dev/null
@@ -0,0 +1,6 @@
+additional.bundles = org.argeo.slc.unit,\
+                     com.springsource.junit
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index 9c07c52e6ea0483dee4d85262a25f40d7480e2d9..acd6f463415743dfecc3865bf0e1977286dec13f 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>
        <description>Implementations of SLC Specs using Castor</description>
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
@@ -37,7 +22,9 @@
                                                <Export-Package>
                                                        org.argeo.slc.*
                                                </Export-Package>
-                                               <Import-Package>org.argeo.slc.*;resolution:=optional,
+                                               <Import-Package>
+                                                       org.argeo.slc.*;resolution:=optional,
+                                                       org.argeo.slc.deploy;resolution:=optional,
                                                        org.argeo.slc.build;resolution:=optional,
                                                        org.argeo.slc.execution;resolution:=optional,
                                                        org.argeo.slc.core.attachment;resolution:=optional,
                                                        org.apache.xml.serialize;resolution:=optional,
                                                        org.apache.xerces.jaxp;resolution:=optional,
                                                        javax.naming;resolution:=optional,
-                                                       javax.naming.directory;resolution:=optional
+                                                       javax.naming.directory;resolution:=optional,
+                                                       javax.xml.transform;resolution:=optional,
+                                                       javax.xml.transform.stream;resolution:=optional,
+                                                       javax.xml.transform.dom;resolution:=optional,
+                                                       org.springframework.xml.validation;resolution:=optional,
+                                                       org.apache.commons.io,
+                                                       org.springframework.oxm,
+                                                       org.springframework.core,
+                                                       org.springframework.xml.transform,
+                                                       org.springframework.core.io
                                                </Import-Package>
                                                <Fragment-Host>com.springsource.org.castor</Fragment-Host>
                                        </instructions>
                                </configuration>
                        </plugin>
-
                </plugins>
        </build>
        <dependencies>
index 438f0fe3b3dd07a0a6fea8f835009e2072fa178b..3e6ecf767d5519108c40bc9c9ea27c164872ca49 100644 (file)
@@ -5,6 +5,6 @@
        <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"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>
index a2d12e5128ff7e51cf911f8758faef23e81613fc..19404bc7a87cc8e4a1ef3c64b4e557c7d517781e 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.equinox/build.properties b/runtime/org.argeo.slc.support.equinox/build.properties
new file mode 100644 (file)
index 0000000..da2d342
--- /dev/null
@@ -0,0 +1,10 @@
+additional.bundles = org.argeo.slc.core,\
+                     org.springframework.context,\
+                     org.argeo.slc.unit,\
+                     com.springsource.junit,\
+                     org.argeo.slc.osgiboot,\
+                     org.eclipse.osgi
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index 7a92c9691bdb16beda23d48167495b3f503ed2b0..9d507e3ce0b9cc6612c698920fab9e2a86ff2c9f 100644 (file)
        <properties />
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <!--
-                                       <executions> <execution> <goals> <goal>test-jar</goal> </goals>
-                                       <configuration> <archive>
-                                       <manifestFile>src/test/resources/META-INF/MANIFEST.MF</manifestFile>
-                                       </archive> </configuration> </execution> </executions>
-                               -->
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
index ab30014f9de8338d65808546f37cf9da882d6895..9711c3c96ed4720b2a1e37c4e2888d59990359e9 100644 (file)
@@ -9,6 +9,7 @@ import org.eclipse.core.runtime.adaptor.EclipseStarter;
 import org.eclipse.osgi.framework.console.CommandInterpreter;
 import org.eclipse.osgi.framework.console.CommandProvider;
 
+@SuppressWarnings("restriction")
 public class ExecutionCommandProvider implements CommandProvider {
        private final static Log log = LogFactory
                        .getLog(ExecutionCommandProvider.class);
index 9653ef0ac65d46aeb55b97fc2273c071f8ec4f1b..110fd7f0b1110a8a65097dcfb44037afd6ad6938 100644 (file)
@@ -5,6 +5,6 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
        <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r
index fac029545d699d06e13afea6ed22ecc7fafd7e1b..0805101720cd3b58f0b0ca4a657efa8b1e555364 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.hibernate/build.properties b/runtime/org.argeo.slc.support.hibernate/build.properties
new file mode 100644 (file)
index 0000000..cdcb6d7
--- /dev/null
@@ -0,0 +1,9 @@
+additional.bundles = org.springframework.transaction,\
+                     org.argeo.slc.unit,\
+                     com.springsource.junit,\
+                     org.springframework.oxm,\
+                     org.springframework.xml
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index 1c82a6b8943b83246180ec118ec6dadcaa28e75e..b700ae3b82ef7cb9507e2c3fd09159c4870d0983 100644 (file)
        <name>SLC Support Hibernate</name>
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
index b4bee872648242ba3f7399d6f3dfa66b2c2b175c..fc460145a4b82500722cb922fc76d370cbfc9f2e 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <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="bin"/>
 </classpath>
index ad3c4fa38144fd7adfd5a1124ebc40ccc2f156f4..e9c6312e852f067d9dc77a8c5fa7d641cb603d24 100644 (file)
                        <arguments>
                        </arguments>
                </buildCommand>
+               <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.jdt.core.javanature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.jcr/pom.xml b/runtime/org.argeo.slc.support.jcr/pom.xml
new file mode 100644 (file)
index 0000000..09a0e60
--- /dev/null
@@ -0,0 +1,42 @@
+<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>runtime</artifactId>
+               <version>0.12.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.runtime</groupId>
+       <artifactId>org.argeo.slc.support.jcr</artifactId>
+       <name>SLC Support JCR</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
+                               <configuration>
+                                       <instructions>
+                                               <Export-Package>
+                                                       org.argeo.slc.jcr.*
+                                               </Export-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.core</artifactId>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.jackrabbit</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file
diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/process/SlcExecutionDaoJcr.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/process/SlcExecutionDaoJcr.java
new file mode 100644 (file)
index 0000000..b83b9fa
--- /dev/null
@@ -0,0 +1,5 @@
+package org.argeo.slc.jcr.process;
+
+public class SlcExecutionDaoJcr {
+
+}
index 3509702640e689f52edd17220cf6146ea46f6733..90d9c1bfdb8c088a54191973e309ac4534fb8646 100644 (file)
@@ -4,7 +4,7 @@
        <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-       <classpathentry kind="output" path="target/classes"/>
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+       <classpathentry kind="output" path="bin"/>
 </classpath>
index 539f8268ebd108b3e27a733dd015b31367a3b062..057f24f1d4223ba5aecf71b439bc260dd176b13c 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.support.jemmy/build.properties b/runtime/org.argeo.slc.support.jemmy/build.properties
new file mode 100644 (file)
index 0000000..7c51e9e
--- /dev/null
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index 10775fe2d31716b112994488df6828f05c61c0fa..0f18a69022d108ba81680ebf67e112cbe8536085 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>
                                        <target>1.4</target>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
+                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
                                                <Export-Package>
                                                        org.argeo.slc.jemmy
                                                </Export-Package>
index d4fb72b92226c06d99fa45815211ddc57e398e50..c41846e272340580df9b2b2b9b09ba99df949a3f 100644 (file)
        <name>SLC Support Maven</name>
        <build>
                <plugins>
-                       <!-- Look to parent pom for inheritances -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
@@ -38,8 +21,8 @@
                                                <Export-Package>
                                                        org.argeo.slc.maven.*
                                                </Export-Package>
-                                               <Import-Package>*,org.codehaus.plexus</Import-Package>
-                                               <Fragment-Host>org.argeo.dep.osgi.maven.embedder</Fragment-Host>
+                                               <Import-Package>*,org.codehaus.plexus;resolution:="optional"</Import-Package>
+                                               <!-- <Fragment-Host>org.argeo.dep.osgi.maven.embedder</Fragment-Host> -->
                                        </instructions>
                                </configuration>
                        </plugin>
diff --git a/runtime/org.argeo.slc.support.osgi/build.properties b/runtime/org.argeo.slc.support.osgi/build.properties
new file mode 100644 (file)
index 0000000..7c51e9e
--- /dev/null
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index 3897000f2a9b15d87bbc3af5c543ceef8f817b37..ceff91f9a1ccb292182a15def8361e8f12ffdb7e 100644 (file)
        <packaging>jar</packaging>
        <properties />
        <build>
-               <outputDirectory>bin</outputDirectory>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>META-INF/**</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
                                        <instructions>
                                                <Export-Package>
                                                        org.argeo.slc.*
@@ -50,8 +28,6 @@
                </plugins>
        </build>
        <dependencies>
-
-
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
diff --git a/runtime/org.argeo.slc.support.simple/build.properties b/runtime/org.argeo.slc.support.simple/build.properties
new file mode 100644 (file)
index 0000000..7c51e9e
--- /dev/null
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index 2971b030b26d06832bba20dffc8858556a4df847..014a2a21965835b2c6dfec697cb4408053ba0e4f 100644 (file)
        <name>SLC Support Simple</name>
        <description>Basic implementations of SLC Specifications</description>
        <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                       </resource>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>META-INF/**</include>
-                               </includes>
-                       </resource>
-               </resources>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
                                        <instructions>
                                                <Export-Package>
                                                        org.argeo.slc.*,org.argeo.slc.core.test.spring
index 6ad668dfd5463a9fe6fce71988cd30292c3413ea..365f7ba73ceec2901fa52321e5f70d9206250138 100644 (file)
@@ -26,6 +26,7 @@ public class SvnKitDriver implements VersioningDriver {
                manager = SVNClientManager.newInstance();\r
        }\r
 \r
+       @SuppressWarnings("deprecation")\r
        public void updateToHead(File fileOrDir) {\r
                try {\r
                        manager.getUpdateClient().doUpdate(fileOrDir, SVNRevision.HEAD,\r
@@ -35,6 +36,7 @@ public class SvnKitDriver implements VersioningDriver {
                }\r
        }\r
 \r
+       @SuppressWarnings("deprecation")\r
        public void importFileOrDir(String repositoryUrl, File fileOrDir) {\r
                try {\r
                        manager.getCommitClient().doImport(fileOrDir,\r
@@ -46,6 +48,7 @@ public class SvnKitDriver implements VersioningDriver {
                }\r
        }\r
 \r
+       @SuppressWarnings("deprecation")\r
        public void checkout(String repositoryUrl, File destDir, Boolean recursive) {\r
                try {\r
                        manager.getUpdateClient().doCheckout(\r
@@ -119,6 +122,7 @@ public class SvnKitDriver implements VersioningDriver {
                }\r
        }\r
 \r
+       @SuppressWarnings("deprecation")\r
        public void commit(File fileOrDir, String commitMessage) {\r
                try {\r
                        manager.getCommitClient().doCommit(new File[] { fileOrDir }, true,\r
index 3c025923423cc77c22969ef76ecf39ffc045fc64..85971d3ef1bf2ee9a6e8b1d69b3a0ad20d9513c8 100644 (file)
        <name>SLC Support Web Services Client (deprecated)</name>
        <build>
                <plugins>
-                       <!-- Look to parent pom for inheritances -->
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
@@ -41,6 +24,7 @@
                                                <Import-Package>org.w3c.dom;version="0.0.0",
                                                        javax.xml.*;version="0.0.0",
                                                        org.xml.*;version="0.0.0",
+                                                       org.springframework.ws.*;resolution:="optional",
                                                        *
                                                </Import-Package>
                                        </instructions>
index 9653ef0ac65d46aeb55b97fc2273c071f8ec4f1b..110fd7f0b1110a8a65097dcfb44037afd6ad6938 100644 (file)
@@ -5,6 +5,6 @@
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
        <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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="output" path="bin"/>\r
 </classpath>\r
index 2c3e0f5affb6349e8143a33b6d43e4e51fb01b65..d4d0be86f3b5bb028ff73fb0d0c9718ff5bd6a9c 100644 (file)
                        </arguments>
                </buildCommand>
                <buildCommand>
-                       <name>org.maven.ide.eclipse.maven2Builder</name>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
        </buildSpec>
        <natures>
                <nature>org.eclipse.jdt.core.javanature</nature>
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>
+               <nature>org.eclipse.pde.PluginNature</nature>
        </natures>
 </projectDescription>
diff --git a/runtime/org.argeo.slc.unit/build.properties b/runtime/org.argeo.slc.unit/build.properties
new file mode 100644 (file)
index 0000000..7c51e9e
--- /dev/null
@@ -0,0 +1,4 @@
+source.. = src/main/java/,\
+           src/main/resources/,\
+           src/test/java/,\
+           src/test/resources/
index 11c6859caf414b9ecb38cd915571603b70b9b3c4..79245efcf03c46b59ea4244bd0e7503be91c3f4d 100644 (file)
        <name>SLC Unit Tests Helpers</name>
        <build>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <!--
-                                       <executions> <execution> <goals> <goal>test-jar</goal> </goals>
-                                       <configuration> <archive>
-                                       <manifestFile>target/test-classes/META-INF/MANIFEST.MF</manifestFile>
-                                       </archive> </configuration> </execution> </executions>
-                               -->
-                       </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
index 98892190ce5457957ca8c94b4489db7e9e00b471..f1f4926b2c7648d8265f9d446a95bd4016d7ca3f 100644 (file)
@@ -19,6 +19,7 @@ import org.osgi.framework.ServiceReference;
 import org.springframework.context.ApplicationContext;
 import org.springframework.osgi.util.OsgiStringUtils;
 
+@SuppressWarnings("restriction")
 public abstract class AbstractOsgiRuntimeTestCase extends TestCase {
        private final static Log log = LogFactory
                        .getLog(AbstractOsgiRuntimeTestCase.class);
index 0f4658e6e72e0b4c02b3ebcaa4f48ce372214a91..0d6c3ec161777fcc79234d425b9a7b4fa59fe70a 100644 (file)
@@ -25,6 +25,7 @@
                <module>org.argeo.slc.support.ant</module>
                <module>org.argeo.slc.support.maven</module>
                <module>org.argeo.slc.support.jemmy</module>
+               <module>org.argeo.slc.support.jcr</module>
                <module>org.argeo.slc.server</module>
                <module>org.argeo.slc.detached</module>
                <module>org.argeo.slc.detached.launcher</module>
                <module>org.argeo.slc.support.ws.client</module>
        </modules>
        <build>
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <archive>
-                                                       <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.maven.plugins</groupId>
-                                       <artifactId>maven-source-plugin</artifactId>
-                               </plugin>
-                               <plugin>
-                                       <groupId>org.apache.felix</groupId>
-                                       <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>${version.maven-bundle-plugin}</version>
-                                       <extensions>true</extensions>
-                                       <configuration>
-                                               <manifestLocation>target/classes/META-INF</manifestLocation>
-                                               <instructions>
-                                                       <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-                                                       <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                                                       <_removeheaders>Bnd-LastModified</_removeheaders>
-                                               </instructions>
-                                       </configuration>
-                                       <executions>
-                                               <execution>
-                                                       <id>bundle-manifest</id>
-                                                       <phase>process-classes</phase>
-                                                       <goals>
-                                                               <goal>manifest</goal>
-                                                       </goals>
-                                               </execution>
-                                       </executions>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
+               <resources>
+                       <resource>
+                               <directory>src/main/resources</directory>
+                       </resource>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>META-INF/**</include>
+                               </includes>
+                       </resource>
+               </resources>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-source-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <manifestLocation>META-INF</manifestLocation>
+                                       <instructions>
+                                               <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
+                                               <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                                               <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+                                               <_removeheaders>Bnd-LastModified</_removeheaders>
+                                       </instructions>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>bundle-manifest</id>
+                                               <phase>process-classes</phase>
+                                               <goals>
+                                                       <goal>manifest</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
        </build>
-       <!--
-               <profiles> <profile> <id>release</id> <build> <plugins> <plugin>
-               <groupId>org.apache.felix</groupId>
-               <artifactId>maven-bundle-plugin</artifactId>
-               <version>${version.maven-bundle-plugin}</version>
-               <extensions>true</extensions> <configuration>
-               <manifestLocation>target/classes/META-INF</manifestLocation>
-               <instructions>
-               <Bundle-Version>${project.version}.r${buildNumber}</Bundle-Version>
-               <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-               <_removeheaders>Bnd-LastModified</_removeheaders> </instructions>
-               </configuration> <executions> <execution> <id>bundle-manifest</id>
-               <phase>process-classes</phase> <goals> <goal>manifest</goal> </goals>
-               </execution> </executions> </plugin> </plugins> </build> </profile>
-               </profiles>
-       -->
        <!--
                <reporting> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId>
                <artifactId>cobertura-maven-plugin</artifactId> </plugin> </plugins>