You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/07/21 20:51:51 UTC
svn commit: r966356 - in /geronimo/server/trunk: plugingroups/javaee6-jetty/
plugingroups/javaee6-jetty/src/main/history/ plugingroups/javaee6-tomcat/
plugingroups/javaee6-tomcat/src/main/history/
plugingroups/javaee6-web-jetty/ plugingroups/javaee6-we...
Author: gawor
Date: Wed Jul 21 18:51:50 2010
New Revision: 966356
URL: http://svn.apache.org/viewvc?rev=966356&view=rev
Log:
enable (non-working) openwebbeans plugin in build just to test dependencies, etc.
Modified:
geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee6-web-jetty/pom.xml
geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml
geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml
geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml
geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/openwebbeans/pom.xml
geronimo/server/trunk/plugins/pom.xml
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/pom.xml Wed Jul 21 18:51:50 2010
@@ -40,20 +40,8 @@
<dependencies>
<!--plugin groups-->
<dependency>
- <groupId>org.apache.geronimo.framework.plugingroups</groupId>
- <artifactId>framework</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>eba-jetty</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>console-jetty</artifactId>
+ <artifactId>javaee6-web-jetty</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
@@ -74,13 +62,6 @@
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>ejb</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>jms</artifactId>
<version>${project.version}</version>
<type>car</type>
@@ -99,9 +80,6 @@
<!--<version>${project.version}</version>-->
<!--<type>car</type>-->
<!--</dependency>-->
- <!-- end plugin groups -->
-
- <!--other plugins-->
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
@@ -117,19 +95,6 @@
<!--<type>car</type>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jmx-security</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>bval-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.plugins.monitoring</groupId>-->
<!--<artifactId>agent-car-ejb</artifactId>-->
@@ -144,12 +109,6 @@
<!--<type>car</type>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>welcome-jetty</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-jetty/src/main/history/dependencies.xml Wed Jul 21 18:51:50 2010
@@ -8,47 +8,17 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>bval-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</artifactId>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>welcome-jetty</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jmx-security</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework.plugingroups</groupId>
- <artifactId>framework</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>client</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>console-jetty</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>eba-jetty</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>ejb</artifactId>
+ <artifactId>javaee6-web-jetty</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml Wed Jul 21 18:51:50 2010
@@ -40,20 +40,8 @@
<dependencies>
<!--plugin groups-->
<dependency>
- <groupId>org.apache.geronimo.framework.plugingroups</groupId>
- <artifactId>framework</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>eba-tomcat</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>console-tomcat</artifactId>
+ <artifactId>javaee6-web-tomcat</artifactId>
<version>${project.version}</version>
<type>car</type>
</dependency>
@@ -74,13 +62,6 @@
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>ejb</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>jms</artifactId>
<version>${project.version}</version>
<type>car</type>
@@ -100,14 +81,6 @@
<!--<type>car</type>-->
<!--</dependency>-->
- <!--other plugins-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>concurrent-deployer</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
-
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</artifactId>
@@ -122,19 +95,6 @@
<!--<type>car</type>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jmx-security</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>bval-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.plugins.monitoring</groupId>-->
<!--<artifactId>agent-car-ejb</artifactId>-->
@@ -149,12 +109,6 @@
<!--<type>car</type>-->
<!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>welcome-tomcat</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/src/main/history/dependencies.xml Wed Jul 21 18:51:50 2010
@@ -8,47 +8,17 @@
</module-id>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>bval-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
<artifactId>javamail</artifactId>
<type>car</type>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>welcome-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jmx-security</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework.plugingroups</groupId>
- <artifactId>framework</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>client</artifactId>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>console-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>eba-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>ejb</artifactId>
+ <artifactId>javaee6-web-tomcat</artifactId>
<type>car</type>
</dependency>
<dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-web-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-web-jetty/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-web-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-web-jetty/pom.xml Wed Jul 21 18:51:50 2010
@@ -58,14 +58,6 @@
<type>car</type>
</dependency>
- <!-- TODO - Should this be in Web Profile?
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency> -->
-
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.plugingroups</groupId>-->
<!--<artifactId>clustering-jetty</artifactId>-->
@@ -88,6 +80,13 @@
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
<!--other plugins-->
<dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-web-jetty/src/main/history/dependencies.xml Wed Jul 21 18:51:50 2010
@@ -13,6 +13,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>welcome-jetty</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml Wed Jul 21 18:51:50 2010
@@ -58,14 +58,6 @@
<type>car</type>
</dependency>
- <!-- TODO - Should this be in Web Profile?
- <dependency>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>client</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency> -->
-
<!--<dependency>-->
<!--<groupId>org.apache.geronimo.plugingroups</groupId>-->
<!--<artifactId>clustering-tomcat</artifactId>-->
@@ -88,6 +80,13 @@
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans-deployer</artifactId>
+ <version>${project.version}</version>
+ <type>car</type>
+ </dependency>
+
<!--other plugins-->
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
Modified: geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-web-tomcat/src/main/history/dependencies.xml Wed Jul 21 18:51:50 2010
@@ -13,6 +13,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openwebbeans-deployer</artifactId>
+ <type>car</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
<artifactId>welcome-tomcat</artifactId>
<type>car</type>
</dependency>
Modified: geronimo/server/trunk/plugingroups/wab-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-jetty/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-jetty/pom.xml Wed Jul 21 18:51:50 2010
@@ -34,7 +34,7 @@
<name>Geronimo Plugin Group :: WAB Jetty</name>
<description>
- This plugin group provides the OSGi RFC66 WAB on Jetty functionality.
+ This plugin group provides support for OSGi Web Applications on Jetty.
</description>
<dependencies>
Modified: geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/wab-tomcat/pom.xml Wed Jul 21 18:51:50 2010
@@ -34,7 +34,7 @@
<name>Geronimo Plugin Group :: WAB Tomcat</name>
<description>
- This plugin group provides the OSGi RFC66 WAB on Tomcat functionality.
+ This plugin group provides support for OSGi Web Applications on Tomcat.
</description>
<dependencies>
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans-builder/src/main/java/org/apache/geronimo/openwebbeans/deployment/OpenWebBeansModuleBuilderExtension.java Wed Jul 21 18:51:50 2010
@@ -18,17 +18,13 @@
package org.apache.geronimo.openwebbeans.deployment;
import java.net.URL;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.jar.JarFile;
-import javax.enterprise.inject.spi.Bean;
-
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.ModuleIDBuilder;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
@@ -47,9 +43,7 @@ import org.apache.geronimo.j2ee.j2eeobje
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.xbeans.javaee6.FullyQualifiedClassType;
-import org.apache.geronimo.xbeans.javaee6.ListenerType;
-import org.apache.geronimo.xbeans.javaee6.WebAppType;
+import org.apache.openejb.jee.WebApp;
import org.apache.webbeans.servlet.WebBeansConfigurationListener;
import org.apache.xbean.finder.ClassFinder;
import org.apache.xmlbeans.XmlObject;
@@ -98,7 +92,6 @@ public class OpenWebBeansModuleBuilderEx
}
EnvironmentBuilder.mergeEnvironments(module.getEnvironment(), defaultEnvironment);
-
}
public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores,
@@ -115,7 +108,7 @@ public class OpenWebBeansModuleBuilderEx
return;
}
WebModule webModule = (WebModule) module;
- WebAppType webApp = (WebAppType) webModule.getSpecDD();
+ WebApp webApp = (WebApp) webModule.getSpecDD();
EARContext moduleContext = module.getEarContext();
Map sharedContext = module.getSharedContext();
@@ -127,37 +120,25 @@ public class OpenWebBeansModuleBuilderEx
Object value = webAppData.getAttribute("listenerClassNames");
if (value instanceof Collection && !((Collection) value).contains(CONTEXT_LISTENER_NAME)) {
((Collection<String>) value).add(CONTEXT_LISTENER_NAME);
- } else {
- // try to add listener to the web app xml
- ListenerType listenerType = webApp.addNewListener();
- FullyQualifiedClassType className = listenerType.addNewListenerClass();
- className.setStringValue(CONTEXT_LISTENER_NAME);
}
-
AbstractName moduleName = moduleContext.getModuleName();
Map<EARContext.Key, Object> buildingContext = new HashMap<EARContext.Key, Object>();
buildingContext.put(NamingBuilder.GBEAN_NAME_KEY, moduleName);
- // use the same jndi context as the web app
- Map compContext = NamingBuilder.JNDI_KEY.get(module.getSharedContext());
- buildingContext.put(NamingBuilder.JNDI_KEY, compContext);
-
- // use the same holder object as the web app.
+ //use the same holder object as the web app.
Holder holder = NamingBuilder.INJECTION_KEY.get(sharedContext);
buildingContext.put(NamingBuilder.INJECTION_KEY, holder);
-
+
XmlObject jettyWebApp = webModule.getVendorDD();
ClassFinder classFinder = createOpenWebBeansClassFinder(webApp, webModule);
webModule.setClassFinder(classFinder);
namingBuilders.buildNaming(webApp, jettyWebApp, webModule, buildingContext);
-
}
- protected ClassFinder createOpenWebBeansClassFinder(WebAppType webApp, WebModule webModule)
+ protected ClassFinder createOpenWebBeansClassFinder(WebApp webApp, WebModule webModule)
throws DeploymentException {
-
List<Class> classes = getManagedClasses(webApp, webModule);
return new ClassFinder(classes);
}
@@ -185,11 +166,8 @@ public class OpenWebBeansModuleBuilderEx
* @throws org.apache.geronimo.common.DeploymentException
*
*/
- private List<Class> getManagedClasses(WebAppType webApp, WebModule webModule) throws DeploymentException {
-
+ private List<Class> getManagedClasses(WebApp webApp, WebModule webModule) throws DeploymentException {
return Collections.EMPTY_LIST;
- }
-
-
+ }
}
Modified: geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/geronimo-openwebbeans/pom.xml Wed Jul 21 18:51:50 2010
@@ -70,7 +70,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
@@ -86,16 +85,50 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.1_spec</artifactId>
- <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>commons-digester</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>commons-discovery</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
</dependency>
@@ -105,30 +138,35 @@
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>scannotation</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>scannotation</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
+ <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-impl</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
+ <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
+ <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jsf</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-osgi</artifactId>
+ </dependency>
+
</dependencies>
Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans/pom.xml Wed Jul 21 18:51:50 2010
@@ -58,7 +58,6 @@
<version>${project.version}</version>
</dependency>
-
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/openwebbeans/src/main/history/dependencies.xml Wed Jul 21 18:51:50 2010
@@ -7,23 +7,23 @@
<type>car</type>
</module-id>
<dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-impl</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
+ <artifactId>commons-digester</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-spi</artifactId>
+ <artifactId>commons-discovery</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-web</artifactId>
+ <artifactId>jstl</artifactId>
<type>jar</type>
</dependency>
<dependency>
@@ -43,6 +43,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
<type>jar</type>
</dependency>
@@ -72,18 +77,58 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-osgi</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+ <artifactId>org.apache.servicemix.bundles.commons-beanutils</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
<type>jar</type>
</dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openwebbeans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openwebbeans/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openwebbeans/pom.xml (original)
+++ geronimo/server/trunk/plugins/openwebbeans/pom.xml Wed Jul 21 18:51:50 2010
@@ -15,11 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!-- $Rev: 805240 $ $Date: 2009-08-17 18:02:22 -0700 (Mon, 17 Aug 2009) $ -->
-
<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>
@@ -31,83 +28,87 @@
<artifactId>openwebbeans</artifactId>
<name>Geronimo Plugins, OpenWebBeans</name>
<packaging>pom</packaging>
-
- <description>
- OpenWebBeans plugin
- </description>
+ <description>OpenWebBeans plugin</description>
<dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>myfaces</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
- <version>1.6.1_3-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
- <version>3.7.ga_1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>scannotation</artifactId>
- <version>1.0.2_1-SNAPSHOT</version>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>myfaces</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.dom4j</artifactId>
+ <version>1.6.1_2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.javassist</artifactId>
+ <version>3.7.ga_1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>scannotation</artifactId>
+ <version>1.0.2_1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.scannotation</groupId>
+ <artifactId>scannotation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-osgi</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <version>1.0.0-SNAPSHOT_1-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<modules>
<module>geronimo-openwebbeans</module>
<module>geronimo-openwebbeans-builder</module>
<module>openwebbeans</module>
<module>openwebbeans-deployer</module>
</modules>
-
</project>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=966356&r1=966355&r2=966356&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed Jul 21 18:51:50 2010
@@ -171,7 +171,7 @@
<module>myfaces</module>
<module>openejb</module>
<module>openjpa2</module>
-<!-- <module>openwebbeans</module>-->
+ <module>openwebbeans</module>
<!--<module>plancreator</module>-->
<module>webservices</module>
<!--<module>ca-helper</module>-->
@@ -246,7 +246,7 @@
<module>myfaces</module>
<module>openejb</module>
<module>openjpa2</module>
- <!-- <module>openwebbeans</module>-->
+ <module>openwebbeans</module>
<module>plancreator</module>
<module>webservices</module>
<module>ca-helper</module>