You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/01/29 23:59:35 UTC
svn commit: r904657 - in /geronimo/server/trunk/framework:
configs/karaf-framework/pom.xml
configs/karaf-framework/src/main/descriptors/geronimo-bin.xml
modules/geronimo-deploy-jsr88-full/
modules/geronimo-deploy-jsr88-full/pom.xml modules/pom.xml
Author: djencks
Date: Fri Jan 29 22:59:35 2010
New Revision: 904657
URL: http://svn.apache.org/viewvc?rev=904657&view=rev
Log:
GERONIMO-5056 simple DeploymentFactory setup that lets some jsr88 stuff work
Added:
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/
- copied from r904619, geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-bootstrapper/
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml
geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/pom.xml
geronimo/server/trunk/framework/modules/pom.xml
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=904657&r1=904656&r2=904657&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Jan 29 22:59:35 2010
@@ -455,6 +455,12 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88-full</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-shell-base</artifactId>
<version>${version}</version>
</dependency>
@@ -575,51 +581,57 @@
<artifactItem>
<groupId>org.apache.felix.karaf</groupId>
<artifactId>org.apache.felix.karaf.main</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>karaf-client</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf-client.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.felix.karaf.jaas</groupId>
<artifactId>org.apache.felix.karaf.jaas.boot</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>karaf-jaas-boot.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-rmi-loader</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>geronimo-rmi-loader.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-main</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>geronimo-main.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>geronimo-cli</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>geronimo-cli.jar</destFileName>
</artifactItem>
<artifactItem>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88-full</artifactId>
+ <outputDirectory>target/dependencies/jsr88</outputDirectory>
+ <destFileName>geronimo-deploy-jsr88-full.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
+ <outputDirectory>target/dependencies/lib</outputDirectory>
<destFileName>commons-cli.jar</destFileName>
</artifactItem>
- <artifactItem>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-naming</artifactId>
- <outputDirectory>target/dependencies</outputDirectory>
- <destFileName>xbean-naming.jar</destFileName>
- </artifactItem>
+ <!--<artifactItem>-->
+ <!--<groupId>org.apache.xbean</groupId>-->
+ <!--<artifactId>xbean-naming</artifactId>-->
+ <!--<outputDirectory>target/dependencies/lib</outputDirectory>-->
+ <!--<destFileName>xbean-naming.jar</destFileName>-->
+ <!--</artifactItem> -->
</artifactItems>
</configuration>
</execution>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml?rev=904657&r1=904656&r2=904657&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/descriptors/geronimo-bin.xml Fri Jan 29 22:59:35 2010
@@ -108,7 +108,7 @@
<!-- Copy over jar files -->
<fileSet>
<directory>target/dependencies</directory>
- <outputDirectory>contents/lib/</outputDirectory>
+ <outputDirectory>contents</outputDirectory>
</fileSet>
</fileSets>
Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/pom.xml?rev=904657&r1=904619&r2=904657&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88-full/pom.xml Fri Jan 29 22:59:35 2010
@@ -28,9 +28,9 @@
<version>3.0-SNAPSHOT</version>
</parent>
- <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
+ <artifactId>geronimo-deploy-jsr88-full</artifactId>
<packaging>bundle</packaging>
- <name>Geronimo Framework, Modules :: Deploy JSR-88 Bootstrapper</name>
+ <name>Geronimo Framework, Modules :: Deploy JSR-88 Standalone</name>
<dependencies>
<dependency>
@@ -38,12 +38,40 @@
<artifactId>geronimo-kernel</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-deploy-jsr88</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
</dependency>
</dependencies>
-
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.geronimo.deployment.plugin*,
+ org.apache.geronimo.deployment.spi*,
+ org.apache.geronimo.common*,
+ org.apache.geronimo.system.jmx*,
+ org.apache.geronimo.system.plugin*,
+ org.apache.geronimo.gbean*,
+ org.apache.geronimo.kernel*,
+ org.osgi.framework,
+ net.sf.cglib*
+ </Export-Package>
+ <J2EE-DeploymentFactory-Implementation-Class>org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl</J2EE-DeploymentFactory-Implementation-Class>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/server/trunk/framework/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/pom.xml?rev=904657&r1=904656&r2=904657&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/pom.xml Fri Jan 29 22:59:35 2010
@@ -77,8 +77,8 @@
<module>geronimo-commands</module>
<module>geronimo-core</module>
<module>geronimo-deploy-jsr88-bootstrapper</module>
+ <module>geronimo-deploy-jsr88-full</module>
<module>geronimo-interceptor</module>
- <!--<module>geronimo-j2ee</module>-->
<module>geronimo-jdbc</module>
<module>geronimo-jmx-remoting</module>
<module>geronimo-config-groovy-transformer</module>