geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r1100440 [4/4] - in /geronimo/server/branches/3.0-osgi: framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/ framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/plugin/model/ plugi...
Date Sat, 07 May 2011 03:47:50 GMT
Modified: geronimo/server/branches/3.0-osgi/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
(original)
+++ geronimo/server/branches/3.0-osgi/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
Sat May  7 03:47:48 2011
@@ -158,7 +158,6 @@ public class WebApplication implements R
             // send out a broadcast alert that we're going to do this
             deploying();
 
-            ConfigurationManager configurationManager = extender.getConfigurationManager();
 
             File configSer = bundle.getBundleContext().getDataFile("config.ser");
             if (configSer.exists() && configSer.lastModified() == bundle.getLastModified())
{
@@ -187,7 +186,6 @@ public class WebApplication implements R
                         webModule.getEnvironment(),
                         ConfigurationModuleType.WAB,
                         naming,
-                        configurationManager,
                         bundle.getBundleContext(),
                         extender.getServerName(),
                         webModule.getModuleName(),
@@ -234,8 +232,8 @@ public class WebApplication implements R
             configurationData.setUseEnvironment(true);
             configurationData.setBundle(bundle);
 
-            configurationManager.loadConfiguration(configurationData);
-            configurationManager.startConfiguration(configurationData.getId());
+//            configurationManager.loadConfiguration(configurationData);
+//            configurationManager.startConfiguration(configurationData.getId());
 
             deployedArtifact = configurationData.getId();
 

Modified: geronimo/server/branches/3.0-osgi/plugins/wab/web-extender/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-osgi/plugins/wab/web-extender/pom.xml?rev=1100440&r1=1100439&r2=1100440&view=diff
==============================================================================
--- geronimo/server/branches/3.0-osgi/plugins/wab/web-extender/pom.xml (original)
+++ geronimo/server/branches/3.0-osgi/plugins/wab/web-extender/pom.xml Sat May  7 03:47:48
2011
@@ -36,6 +36,41 @@
     <dependencies>
 
         <dependency>
+             <groupId>org.apache.geronimo.framework.feature</groupId>
+             <artifactId>j2ee-system</artifactId>
+             <version>${project.version}</version>
+             <type>xml</type>
+             <classifier>features</classifier>
+         </dependency>
+         <!--<dependency>-->
+             <!--<groupId>org.apache.geronimo.framework.feature</groupId>-->
+             <!--<artifactId>server-security-config</artifactId>-->
+             <!--<version>${project.version}</version>-->
+             <!--<type>kar</type>-->
+         <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.feature</groupId>
+            <artifactId>org.apache.geronimo.javaee-specs</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-naming</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-server</artifactId>
             <version>${project.version}</version>
@@ -65,6 +100,13 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
+                    <features>
+                        <feature>declarative-services</feature>
+                        <feature>org.apache.geronimo.jaxb-support</feature>
+                        <feature>org.apache.geronimo.javaee-specs</feature>
+                        <feature>j2ee-system</feature>
+                        <!--<feature>server-security-config</feature>-->
+                    </features>
                     <category>Geronimo Core</category>
                 </configuration>
             </plugin>



Mime
View raw message