]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
Simplify OSGi
authorMathieu Baudier <mbaudier@argeo.org>
Fri, 13 Mar 2009 16:45:40 +0000 (16:45 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Fri, 13 Mar 2009 16:45:40 +0000 (16:45 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@2261 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

29 files changed:
demo/site/org.argeo.slc.demo.agent/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/.project [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/.settings/org.eclipse.pde.core.prefs [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
demo/site/org.argeo.slc.demo.basic/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.deploy/META-INF/slc/dep/manager.maven
demo/site/org.argeo.slc.demo.deploy/pom.xml
demo/site/org.argeo.slc.demo.log4j/.project [new file with mode: 0644]
demo/site/org.argeo.slc.demo.log4j/.settings/org.eclipse.pde.core.prefs [new file with mode: 0644]
demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF [new file with mode: 0644]
demo/site/org.argeo.slc.demo.log4j/log4j.properties [new file with mode: 0644]
demo/site/org.argeo.slc.demo.log4j/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/.project [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/META-INF/MANIFEST.MF
demo/site/org.argeo.slc.demo.manager/build.properties [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/conf/manager.xml
demo/site/org.argeo.slc.demo.manager/conf/maven.xml [deleted file]
demo/site/org.argeo.slc.demo.manager/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/target/maven-archiver/pom.properties [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT-tests.jar [new file with mode: 0644]
demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT.jar [new file with mode: 0644]
demo/site/pom.xml [new file with mode: 0644]
org.argeo.slc/pom.xml
runtime/org.argeo.slc.osgiboot/pom.xml
runtime/org.argeo.slc.osgiboot/src/assembly/osgiboot.xml [new file with mode: 0644]
runtime/org.argeo.slc.support.hibernate/pom.xml
runtime/org.argeo.slc.support.simple/pom.xml
server/org.argeo.slc.siteserver/pom.xml

diff --git a/demo/site/org.argeo.slc.demo.agent/pom.xml b/demo/site/org.argeo.slc.demo.agent/pom.xml
new file mode 100644 (file)
index 0000000..799918f
--- /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>argeo-slc-demo</artifactId>
+               <version>0.11.3-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.demo</groupId>
+       <artifactId>org.argeo.slc.demo.agent</artifactId>
+       <name>Argeo SLC Demo Agent</name>
+       <packaging>jar</packaging>
+       <properties></properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                                       <classesDirectory>.</classesDirectory>
+                                       <includes>
+                                               <include>META-INF/spring/*</include>
+                                       </includes>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.activemq</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.castor</artifactId>
+               </dependency>
+       </dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.basic/.project b/demo/site/org.argeo.slc.demo.basic/.project
new file mode 100644 (file)
index 0000000..17be374
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.demo.basic</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>
diff --git a/demo/site/org.argeo.slc.demo.basic/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.basic/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..e2c3c3e
--- /dev/null
@@ -0,0 +1,5 @@
+#Fri Mar 13 13:44:23 CET 2009
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false
+resolve.requirebundle=false
index b5326e558120dcb20064ec13518fa1f16fd55017..2338f2b6ec1e7f1385d0bae16180f3888ddfe01b 100644 (file)
@@ -1,22 +1,23 @@
 Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
+Bundle-ManifestVersion: 2
+Bundle-Name: Basic Plug-in
+Bundle-SymbolicName: org.argeo.slc.demo.basic
+Bundle-Version: 1.0.0
+Export-Package: conf;version="0.11.3.SNAPSHOT",
+ conf.testCases;version="0.11.3.SNAPSHOT"
+Require-Bundle: org.argeo.slc.support.equinox,
+ org.argeo.slc.specs,
+ org.argeo.slc.support.simple,
+ org.springframework.aop,
+ com.springsource.net.sf.cglib,
+ com.springsource.org.aopalliance
+Import-Package: org.apache.commons.logging;version="1.1",
+ org.springframework.beans.factory.config;version="2.5.6.A"
 Created-By: 1.6.0_0 (Sun Microsystems Inc.)
-Built-By: mbaudier
-Build-Jdk: 1.6.0_0
-Export-Package: conf;version="0.11.3.SNAPSHOT",conf.testCases;version=
- "0.11.3.SNAPSHOT"
+Archiver-Version: Plexus Archiver
 Tool: Bnd-0.0.255
-Bundle-Name: Argeo SLC Demo Basic Test Module
-Require-Bundle: org.argeo.slc.support.equinox,org.argeo.slc.specs,org.
- argeo.slc.support.simple,org.springframework.aop,com.springsource.net
- .sf.cglib,com.springsource.org.aopalliance
-Bundle-Vendor: Argeo
-Bundle-Version: 0.11.3.SNAPSHOT
-Spring-Context: conf/*,conf/testCases/*
-Bundle-ManifestVersion: 2
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.commons.logging;version="1.1",org.springfra
- mework.beans.factory.config;version="2.5.6.A"
-Bundle-SymbolicName: org.argeo.slc.demo.basic
+Build-Jdk: 1.6.0_0
+Spring-Context: conf/*,conf/testCases/*
+Built-By: mbaudier
 Bundle-DocURL: http://www.argeo.org
-
diff --git a/demo/site/org.argeo.slc.demo.basic/pom.xml b/demo/site/org.argeo.slc.demo.basic/pom.xml
new file mode 100644 (file)
index 0000000..8cd5ec1
--- /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>argeo-slc-demo</artifactId>
+               <version>0.11.3-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.demo</groupId>
+       <artifactId>org.argeo.slc.demo.basic</artifactId>
+       <name>Argeo SLC Demo Basic Test Module</name>
+       <packaging>jar</packaging>
+       <properties></properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                                       <classesDirectory>.</classesDirectory>
+                                       <includes>
+                                               <include>conf/**</include>
+                                       </includes>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.simple</artifactId>
+               </dependency>
+       </dependencies>
+</project>
index b0ae3606ea880472a09b3ae8f30a48b15108fafb..8315df7f58d8b50ccd0418f0ed5c746035d0e567 100644 (file)
@@ -1,6 +1,5 @@
 
 The following files have been resolved:
-   com.jcraft.jzlib:com.springsource.com.jcraft.jzlib:jar:1.0.7:compile
    com.thoughtworks.xstream:com.springsource.com.thoughtworks.xstream:jar:1.2.2:compile
    javax.activation:com.springsource.javax.activation:jar:1.1.1:compile
    javax.ejb:com.springsource.javax.ejb:jar:3.0.0:compile
@@ -25,8 +24,7 @@ The following files have been resolved:
    org.apache.xerces:com.springsource.org.apache.xerces:jar:2.8.1:compile
    org.apache.xml:com.springsource.org.apache.xml.resolver:jar:1.2.0:compile
    org.apache.xmlcommons:com.springsource.org.apache.xmlcommons:jar:1.3.3:compile
-   org.argeo.dep.osgi:org.argeo.dep.osgi.activemq:jar:5.2.0.argeo.2:compile
-   org.argeo.dep.osgi:org.argeo.dep.osgi.maven.embedder:jar:2.0.4.argeo.1-SNAPSHOT:compile
+   org.argeo.dep.osgi:org.argeo.dep.osgi.activemq:jar:5.2.0.argeo.3:compile
    org.argeo.slc:org.argeo.slc.detached.launcher:jar:0.11.3-SNAPSHOT:compile
    org.argeo.slc.demo:org.argeo.slc.demo.basic:jar:0.11.3-SNAPSHOT:compile
    org.argeo.slc.demo:org.argeo.slc.demo.log4j:jar:0.11.3-SNAPSHOT:compile
@@ -42,8 +40,8 @@ The following files have been resolved:
    org.dbunit:com.springsource.org.dbunit:jar:2.2.0:compile
    org.eclipse.osgi:org.eclipse.osgi:jar:3.4.2.R34x_v20080826-1230:compile
    org.junit:com.springsource.junit:jar:3.8.2:compile
-   org.objectweb.asm:com.springsource.org.objectweb.asm:jar:2.2.0:compile
-   org.objectweb.asm:com.springsource.org.objectweb.asm.attrs:jar:2.2.0:compile
+   org.objectweb.asm:com.springsource.org.objectweb.asm:jar:1.5.3:compile
+   org.objectweb.asm:com.springsource.org.objectweb.asm.attrs:jar:1.5.3:compile
    org.springframework:org.springframework.aop:jar:2.5.6.A:compile
    org.springframework:org.springframework.beans:jar:2.5.6.A:compile
    org.springframework:org.springframework.context:jar:2.5.6.A:compile
index 6f56921e3c9919faf49faf4ff4f181b254084683..72284c240a9f146ceb6926e80edf0a6b4ab048db 100644 (file)
@@ -5,85 +5,58 @@
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc-demo</artifactId>
                <version>0.11.3-SNAPSHOT</version>
-               <relativePath>../..</relativePath>
+               <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>
        <artifactId>org.argeo.slc.demo.deploy</artifactId>
        <name>Argeo SLC Demo Deploy</name>
-       <packaging>jar</packaging>
+       <packaging>pom</packaging>
        <properties></properties>
        <build>
-               <resources>
-                       <resource>
-                               <directory>.</directory>
-                               <includes>
-                                       <include>META-INF/**</include>
-                               </includes>
-                       </resource>
-               </resources>
+               <defaultGoal>antrun:run</defaultGoal>
                <plugins>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
-                       </plugin>
                        <plugin>
                                <artifactId>maven-dependency-plugin</artifactId>
                                <executions>
                                        <execution>
-                                               <id>manager</id>
-                                               <phase>initialize</phase>
                                                <goals>
-                                                       <goal>list</goal>
+                                                       <goal>unpack</goal>
                                                </goals>
-                                               <configuration>
-                                                       <outputFile>META-INF/slc/dep/manager.maven</outputFile>
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>copy</id>
                                                <phase>initialize</phase>
-                                               <goals>
-                                                       <goal>copy</goal>
-                                               </goals>
                                                <configuration>
-                                                       <outputDirectory>${project.build.directory}/equinox</outputDirectory>
-                                                       <stripVersion>true</stripVersion>
+                                                       <outputDirectory>target/equinox</outputDirectory>
                                                        <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>org.eclipse.osgi</groupId>
-                                                                       <artifactId>org.eclipse.osgi</artifactId>
-                                                                       <version>${version.equinox}</version>
-                                                               </artifactItem>
                                                                <artifactItem>
                                                                        <groupId>org.argeo.slc.runtime</groupId>
                                                                        <artifactId>org.argeo.slc.osgiboot</artifactId>
                                                                        <version>${project.version}</version>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       <groupId>org.argeo.slc.runtime</groupId>
-                                                                       <artifactId>org.argeo.slc.osgiboot</artifactId>
-                                                                       <version>${project.version}</version>
-                                                                       <type>xml</type>
+                                                                       <type>tar.gz</type>
                                                                        <classifier>osgiboot</classifier>
                                                                </artifactItem>
                                                        </artifactItems>
                                                </configuration>
                                        </execution>
                                </executions>
+
                        </plugin>
                        <plugin>
                                <artifactId>maven-antrun-plugin</artifactId>
                                <configuration>
                                        <tasks>
-                                               <property name="slc.osgi.locations" refid="maven.compile.classpath" />
+                                               <path id="slc.osgi.locations.raw">
+                                                       <dirset dir="${user.dir}/..">
+                                                               <include name="*" />
+                                                               <exclude name=".svn" />
+                                                               <exclude name="*.deploy" />
+                                                       </dirset>
+                                                       <path refid="maven.compile.classpath" />
+                                               </path>
+                                               <pathconvert dirsep="/" property="slc.osgi.locations"
+                                                       refid="slc.osgi.locations.raw" />
+
                                                <property name="slc.osgi.start"
                                                        value="org.springframework.osgi.extender,org.argeo.slc.demo.basic" />
-                                               <ant
-                                                       antfile="${project.build.directory}/equinox/org.argeo.slc.osgiboot-osgiboot.xml" />
+                                               <ant antfile="target/equinox/osgiboot.xml" />
 
                                        </tasks>
                                </configuration>
 
                </plugins>
        </build>
+       <profiles>
+               <profile>
+                       <id>agent</id>
+                       <dependencies>
+                               <dependency>
+                                       <groupId>org.argeo.slc.demo</groupId>
+                                       <artifactId>org.argeo.slc.demo.agent</artifactId>
+                                       <version>${project.version}</version>
+                               </dependency>
+                               <dependency>
+                                       <groupId>com.thoughtworks.xstream</groupId>
+                                       <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
+                                       <version>1.2.2</version>
+                               </dependency>
+                       </dependencies>
+               </profile>
+       </profiles>
        <dependencies>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.activemq</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.castor</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.maven</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
 
                <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.detached.launcher</artifactId>
+                       <groupId>org.argeo.slc.demo</groupId>
+                       <artifactId>org.argeo.slc.demo.basic</artifactId>
                        <version>${project.version}</version>
                </dependency>
-
                <dependency>
                        <groupId>org.argeo.slc.demo</groupId>
-                       <artifactId>org.argeo.slc.demo.basic</artifactId>
+                       <artifactId>org.argeo.slc.demo.manager</artifactId>
                        <version>${project.version}</version>
                </dependency>
                <dependency>
                        <artifactId>org.argeo.slc.demo.log4j</artifactId>
                        <version>${project.version}</version>
                </dependency>
-
-
-               <dependency>
-                       <groupId>com.thoughtworks.xstream</groupId>
-                       <artifactId>com.springsource.com.thoughtworks.xstream</artifactId>
-                       <version>1.2.2</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.xerces</groupId>
-                       <artifactId>
-                                       com.springsource.org.apache.xerces
-                               </artifactId>
-                       <version>2.8.1</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.xmlcommons</groupId>
-                       <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
-                       <version>1.3.3</version>
-               </dependency>
-
        </dependencies>
 </project>
diff --git a/demo/site/org.argeo.slc.demo.log4j/.project b/demo/site/org.argeo.slc.demo.log4j/.project
new file mode 100644 (file)
index 0000000..54f7c62
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.demo.log4j</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>
diff --git a/demo/site/org.argeo.slc.demo.log4j/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.log4j/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..2f9fe3d
--- /dev/null
@@ -0,0 +1,5 @@
+#Fri Mar 13 13:55:45 CET 2009
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.log4j/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..e632ac3
--- /dev/null
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Log4j Plug-in
+Bundle-SymbolicName: org.argeo.slc.demo.log4j
+Bundle-Version: 1.0.0
+Fragment-Host: com.springsource.org.apache.log4j
+
diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
new file mode 100644 (file)
index 0000000..3ee8504
--- /dev/null
@@ -0,0 +1,25 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
+log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
+log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
+
+log4j.logger.org.springframework=WARN
+
+log4j.logger.org.apache.activemq=WARN
+log4j.logger.org.apache.activemq.transport=WARN
+log4j.logger.org.apache.activemq.selector=WARN
+
+log4j.logger.org.apache.catalina=INFO
+log4j.logger.org.apache.coyote=INFO
+log4j.logger.org.apache.tomcat=INFO
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
diff --git a/demo/site/org.argeo.slc.demo.log4j/pom.xml b/demo/site/org.argeo.slc.demo.log4j/pom.xml
new file mode 100644 (file)
index 0000000..ef3f9e6
--- /dev/null
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>argeo-slc-demo</artifactId>
+               <version>0.11.3-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.demo</groupId>
+       <artifactId>org.argeo.slc.demo.log4j</artifactId>
+       <name>Argeo SLC Demo Logging</name>
+       <packaging>jar</packaging>
+       <properties></properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                                       <classesDirectory>.</classesDirectory>
+                                       <includes>
+                                               <include>log4j.properties</include>
+                                       </includes>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+
+               <dependency>
+                       <groupId>org.apache.log4j</groupId>
+                       <artifactId>com.springsource.org.apache.log4j</artifactId>
+               </dependency>
+       </dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.manager/.project b/demo/site/org.argeo.slc.demo.manager/.project
new file mode 100644 (file)
index 0000000..86280b2
--- /dev/null
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.demo.manager</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>
diff --git a/demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.manager/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..cfc761f
--- /dev/null
@@ -0,0 +1,5 @@
+#Fri Mar 13 15:28:46 CET 2009
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false
+resolve.requirebundle=false
index cf3ff809ff589175a3b5822544aa3db5f47ba44b..3ee9f68e9c067ef092a4ba3c822abc9bc1cee818 100644 (file)
@@ -1,27 +1,14 @@
 Manifest-Version: 1.0
-Export-Package: org.argeo.slc.demo.manager;uses:="org.apache.commons.l
- ogging";version="0.11.3.SNAPSHOT"
-Tool: Bnd-0.0.255
-Bundle-Name: Argeo SLC Demo Manager
-Created-By: 1.6.0_0 (Sun Microsystems Inc.)
-Require-Bundle: org.springframework.jms,
- com.springsource.org.castor,
- org.argeo.dep.osgi.activemq,
- org.argeo.slc.support.equinox,
- org.argeo.slc.support.activemq,
- org.argeo.slc.specs,
- org.argeo.slc.support.simple,
- org.springframework.aop,
- org.springframework.oxm,
- com.springsource.net.sf.cglib,
- com.springsource.org.aopalliance
-Bundle-Vendor: Argeo
-Bundle-Version: 0.11.3.SNAPSHOT
-Spring-Context: conf/*
 Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Import-Package: org.apache.commons.logging;version="1.1",org.springfra
- mework.beans.factory.config;version="2.5.6.A"
+Bundle-Name: Manager Plug-in
 Bundle-SymbolicName: org.argeo.slc.demo.manager
+Bundle-Version: 1.0.0
+Spring-Context: conf/*
+Created-By: 1.6.0_0 (Sun Microsystems Inc.)
+Import-Package: org.apache.commons.logging;version="1.1",
+ org.argeo.slc.core.execution;version="0.11.3.SNAPSHOT",
+ org.argeo.slc.execution;version="0.11.3.SNAPSHOT",
+ org.springframework.beans.factory.config;version="2.5.6.A"
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-DocURL: http://www.argeo.org
-
+Tool: Bnd-0.0.255
diff --git a/demo/site/org.argeo.slc.demo.manager/build.properties b/demo/site/org.argeo.slc.demo.manager/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
@@ -0,0 +1 @@
+bin.includes = META-INF/
index 34b9c3da4585d17b5f5351960a47cf9e934ddfb4..ba9fea471d281146d9dea4abbc2965a5e42a2678 100644 (file)
@@ -7,23 +7,4 @@
        <bean id="modulesManager" class="org.argeo.slc.core.execution.DefaultModulesManager">\r
                <property name="executionModules" ref="executionModules" />\r
        </bean>\r
-<!-- \r
-       <bean class="org.argeo.slc.osgi.BundlesManager" init-method="init">\r
-               <property name="urlsToInstall">\r
-                       <bean class="org.argeo.slc.maven.MavenToUrl">\r
-                               <property name="baseUrl" value="reference:file:${user.home}/.m2/repository/" />\r
-                               <property name="mavenFiles">\r
-                                       <bean class="org.argeo.slc.maven.DependencyFileLoader">\r
-                                               <property name="dependenciesResource"\r
-                                                       value="classpath:/META-INF/slc/dep/manager.maven" />\r
-                                       </bean>\r
-                               </property>\r
-                       </bean>\r
-               </property>\r
-       </bean>\r
- -->\r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">\r
-               <property name="ignoreUnresolvablePlaceholders" value="true" />\r
-       </bean>\r
 </beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/conf/maven.xml b/demo/site/org.argeo.slc.demo.manager/conf/maven.xml
deleted file mode 100644 (file)
index 0fb5c6a..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-<!-- 
-       <bean id="mavenManager" class="org.argeo.slc.maven.MavenManager"
-               init-method="init">
-               <property name="remoteRepositories">
-                       <list>
-                               <bean class="org.argeo.slc.maven.RemoteRepository">
-                                       <property name="id" value="central" />
-                                       <property name="url" value="http://repo1.maven.org/maven2" />
-                               </bean>
-                       </list>
-               </property>
-       </bean>
-        -->
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.manager/pom.xml b/demo/site/org.argeo.slc.demo.manager/pom.xml
new file mode 100644 (file)
index 0000000..8d5177d
--- /dev/null
@@ -0,0 +1,38 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>argeo-slc-demo</artifactId>
+               <version>0.11.3-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <groupId>org.argeo.slc.demo</groupId>
+       <artifactId>org.argeo.slc.demo.manager</artifactId>
+       <name>Argeo SLC Demo Manager</name>
+       <packaging>jar</packaging>
+       <properties></properties>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                                       <classesDirectory>.</classesDirectory>
+                                       <includes>
+                                               <include>conf/**</include>
+                                       </includes>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.simple</artifactId>
+               </dependency>
+       </dependencies>
+</project>
diff --git a/demo/site/org.argeo.slc.demo.manager/target/maven-archiver/pom.properties b/demo/site/org.argeo.slc.demo.manager/target/maven-archiver/pom.properties
new file mode 100644 (file)
index 0000000..a9be558
--- /dev/null
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Fri Mar 13 17:40:59 CET 2009
+version=0.11.3-SNAPSHOT
+groupId=org.argeo.slc.demo
+artifactId=org.argeo.slc.demo.manager
diff --git a/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT-tests.jar b/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT-tests.jar
new file mode 100644 (file)
index 0000000..4bb7ac9
Binary files /dev/null and b/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT-tests.jar differ
diff --git a/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT.jar b/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT.jar
new file mode 100644 (file)
index 0000000..b6073a6
Binary files /dev/null and b/demo/site/org.argeo.slc.demo.manager/target/org.argeo.slc.demo.manager-0.11.3-SNAPSHOT.jar differ
diff --git a/demo/site/pom.xml b/demo/site/pom.xml
new file mode 100644 (file)
index 0000000..a278c00
--- /dev/null
@@ -0,0 +1,20 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>argeo-slc</artifactId>
+               <version>0.11.3-SNAPSHOT</version>
+               <relativePath>../../org.argeo.slc</relativePath>
+       </parent>
+       <artifactId>argeo-slc-demo</artifactId>
+       <packaging>pom</packaging>
+       <name>Argeo SLC Demo</name>
+       <modules>
+               <module>org.argeo.slc.demo.basic</module>
+               <module>org.argeo.slc.demo.manager</module>
+               <module>org.argeo.slc.demo.agent</module>
+               <module>org.argeo.slc.demo.deploy</module>
+               <module>org.argeo.slc.demo.log4j</module>
+       </modules>
+</project>
index ef96635698fdd371b20860a478d3d3774a2ea133..7b119815668d9bb3b01dc63d348bf198f24cf016 100644 (file)
@@ -547,12 +547,12 @@ limitations under the License.
                        <dependency>
                                <groupId>org.objectweb.asm</groupId>
                                <artifactId>com.springsource.org.objectweb.asm</artifactId>
-                               <version>2.2.0</version>
+                               <version>1.5.3</version>
                        </dependency>
                        <dependency>
                                <groupId>org.objectweb.asm</groupId>
                                <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-                               <version>2.2.0</version>
+                               <version>1.5.3</version>
                        </dependency>
 
                        <!-- Ant -->
index 6781b6a02a724d84b5c91eef28b5a7b69d6c4d8b..02ee44aaeb58f226ebc6633dc94c0ac6a6d76672 100644 (file)
                                <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>
diff --git a/runtime/org.argeo.slc.osgiboot/src/assembly/osgiboot.xml b/runtime/org.argeo.slc.osgiboot/src/assembly/osgiboot.xml
new file mode 100644 (file)
index 0000000..f7df1eb
--- /dev/null
@@ -0,0 +1,35 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+       <id>osgiboot</id>
+       <includeBaseDirectory>false</includeBaseDirectory>
+       <formats>
+               <format>tar.gz</format>
+       </formats>
+       <files>
+               <file>
+                       <source>target/${project.artifactId}-${project.version}.jar
+                       </source>
+                       <outputDirectory></outputDirectory>
+                       <destName>${project.artifactId}.jar
+                       </destName>
+               </file>
+       </files>
+       <fileSets>
+               <fileSet>
+                       <directory>src/main/ant</directory>
+                       <outputDirectory></outputDirectory>
+               </fileSet>
+       </fileSets>
+       <dependencySets>
+               <dependencySet>
+                       <unpack>false</unpack>
+                       <outputDirectory></outputDirectory>
+                       <outputFileNameMapping>org.eclipse.osgi.jar
+                       </outputFileNameMapping>
+                       <includes>
+                               <include>org.eclipse.osgi:org.eclipse.osgi:jar
+                               </include>
+                       </includes>
+               </dependencySet>
+       </dependencySets>
+</assembly>
\ No newline at end of file
index 2ec10792548f97330dc6b01a9b7362b9611df889..a40133d00ed4793ff8903a919690fba86a51ffe9 100644 (file)
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
+                                               <Fragment-Host>org.argeo.slc.support.simple</Fragment-Host>
+                                               <Import-Package>*,org.hibernate.proxy</Import-Package>
+                                               
+                                       <!-- 
                                                <Export-Package>
                                                        org.argeo.slc.hibernate.*
                                                </Export-Package>
@@ -50,6 +54,7 @@
                                                org.argeo.slc.msg.test.tree;resolution:=optional
                                                </Import-Package>
                                                <Fragment-Host>com.springsource.org.hibernate</Fragment-Host>
+                                                -->
                                        </instructions>
                                </configuration>
                        </plugin>
index c2fd56e940092f09ba5b34af3de5643c3e1ac7fc..7b955acd2fd62e8f4f9cda954f39dbd58f13fc44 100644 (file)
@@ -39,7 +39,6 @@
                                                        org.argeo.slc.*,org.argeo.slc.core.test.spring
                                                </Export-Package>
                                                <Import-Package>*,org.apache.commons.logging;version="1.1",
-                                                       org.hibernate.proxy;resolution:="optional",
                                                        org.dbunit;resolution:="optional",
                                                        org.dbunit.database;resolution:="optional",
                                                        org.dbunit.dataset;resolution:="optional",
index a977a52e0d6011936912e9fe8e9fef8882ce67b8..be172aaa21d908cd37315c71edf1a41a6744310e 100644 (file)
        <packaging>pom</packaging>
        <name>Argeo SLC Site server</name>
        <properties>
-               <spring-osgi.version>1.1.2</spring-osgi.version>
-               <spring.version>2.5.5</spring.version>
+               <bundlesToStart>
+                       org.argeo.dep.osgi.catalina.start,
+                       org.springframework.osgi.extender,
+                       org.springframework.osgi.web.extender,
+                       org.springframework.osgi.samples.simplewebapp,
+                       org.argeo.slc.server.activemq,
+                       org.argeo.slc.server.hibernate,
+                       org.argeo.slc.webapp,
+                       org.argeo.slc.demo.basic,
+                       org.argeo.slc.demo.manager
+               </bundlesToStart>
        </properties>
        <build>
                <plugins>
                                <artifactId>maven-dependency-plugin</artifactId>
                                <executions>
                                        <execution>
-                                               <id>copy</id>
-                                               <phase>initialize</phase>
                                                <goals>
-                                                       <goal>copy</goal>
+                                                       <goal>unpack</goal>
                                                </goals>
+                                               <phase>initialize</phase>
                                                <configuration>
-                                                       <outputDirectory>${project.build.directory}/equinox</outputDirectory>
-                                                       <stripVersion>true</stripVersion>
+                                                       <outputDirectory>target/equinox</outputDirectory>
                                                        <artifactItems>
-                                                               <artifactItem>
-                                                                       <groupId>org.eclipse.osgi</groupId>
-                                                                       <artifactId>org.eclipse.osgi</artifactId>
-                                                                       <version>${version.equinox}</version>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       <groupId>org.argeo.slc.runtime</groupId>
-                                                                       <artifactId>org.argeo.slc.osgiboot</artifactId>
-                                                                       <version>${project.version}</version>
-                                                               </artifactItem>
                                                                <artifactItem>
                                                                        <groupId>org.argeo.slc.runtime</groupId>
                                                                        <artifactId>org.argeo.slc.osgiboot</artifactId>
                                                                        <version>${project.version}</version>
-                                                                       <type>xml</type>
+                                                                       <type>tar.gz</type>
                                                                        <classifier>osgiboot</classifier>
                                                                </artifactItem>
-                                                               <!--  For Hibernate -->
-                                                               <artifactItem>
-                                                                       <groupId>org.objectweb.asm</groupId>
-                                                                       <artifactId>com.springsource.org.objectweb.asm</artifactId>
-                                                                       <version>1.5.3</version>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       <groupId>org.objectweb.asm</groupId>
-                                                                       <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
-                                                                       <version>1.5.3</version>
-                                                               </artifactItem>
                                                        </artifactItems>
                                                </configuration>
                                        </execution>
@@ -67,9 +53,6 @@
                                <artifactId>maven-antrun-plugin</artifactId>
                                <configuration>
                                        <tasks>
-
-                                               <property name="equinoxDir" location="${project.build.directory}/equinox" />
-
                                                <path id="slc.osgi.locations.raw">
                                                        <dirset dir="${user.dir}/bundles">
                                                                <include name="*" />
                                                                <include name="*" />
                                                                <exclude name=".svn" />
                                                        </dirset>
-                                                       <!-- Old ASM for Hibernate: -->
-                                                       <pathelement
-                                                               location="${equinoxDir}/com.springsource.org.objectweb.asm.jar" />
-                                                       <pathelement
-                                                               location="${equinoxDir}/com.springsource.org.objectweb.asm.attrs.jar" />
                                                        <!-- Dev for Argeo RIA: -->
                                                        <!--
                                                                <pathelement
                                                        <path refid="maven.compile.classpath" />
                                                </path>
                                                <pathconvert dirsep="/" property="slc.osgi.locations"
-                                                       refid="slc.osgi.locations.raw">
-                                               </pathconvert>
+                                                       refid="slc.osgi.locations.raw" />
 
-                                               <property name="slc.osgi.start"
-                                                       value="org.argeo.dep.osgi.catalina.start,org.springframework.osgi.extender,org.springframework.osgi.web.extender,org.springframework.osgi.samples.simplewebapp,org.argeo.slc.server.activemq,org.argeo.slc.server.hibernate,org.argeo.slc.webapp,org.argeo.slc.demo.basic,org.argeo.slc.demo.manager" />
+                                               <property name="slc.osgi.start" value="${bundlesToStart}" />
 
                                                <property name="javaCommand" value="java -Xmx256m" />
-                                               <ant antfile="${equinoxDir}/org.argeo.slc.osgiboot-osgiboot.xml" />
-
+                                               <ant antfile="target/equinox/osgiboot.xml" />
                                        </tasks>
                                </configuration>
                        </plugin>
-
-                       <!--
-                               <plugin> <artifactId>maven-dependency-plugin</artifactId>
-                               <executions> <execution> <id>manager</id> <phase>initialize</phase>
-                               <goals> <goal>list</goal> </goals> <configuration>
-                               <outputFile>target/server.maven</outputFile> </configuration>
-                               </execution> </executions> </plugin>
-                       -->
-                       <!--
-                               <plugin> <groupId>org.mortbay.jetty</groupId>
-                               <artifactId>maven-jetty-plugin</artifactId> <configuration>
-                               <webApp>${project.build.directory}/dependency/org.argeo.slc.webapp.war</webApp>
-                               <scanIntervalSeconds>0</scanIntervalSeconds>
-                               <webDefaultXml>../../org.argeo.slc.webapp/src/main/config/jetty/webdefault.xml</webDefaultXml>
-                               <jettyConfig>src/test/config/jetty/jetty.xml</jettyConfig>
-                               <systemProperties> <systemProperty> <name>appserver.base</name>
-                               <value>target</value> </systemProperty> <systemProperty>
-                               <name>appserver.home</name> <value>target</value> </systemProperty>
-                               </systemProperties> </configuration> </plugin>
-                       -->
                </plugins>
        </build>
        <dependencies>
 
                <!-- For demo -->
                <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.activemq</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.castor</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.maven</artifactId>
+                       <groupId>org.argeo.slc.demo</groupId>
+                       <artifactId>org.argeo.slc.demo.deploy</artifactId>
                        <version>${project.version}</version>
                </dependency>
 
        </dependencies>
-       <!--
-               <repositories> <repository> <id>spring-osgified-artifacts</id>
-               <snapshots> <enabled>true</enabled> </snapshots> <name>Springframework
-               Maven OSGified Artifacts Repository</name>
-               <url>http://maven.springframework.org/osgi</url> </repository>
-               </repositories>
-       -->
 </project>
\ No newline at end of file