geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1033330 - in /geronimo/server/trunk/plugins/myfaces: geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/ myfaces-deployer/src/main/plan/ myfaces/src/main/history/
Date Wed, 10 Nov 2010 02:28:42 GMT
Author: xuhaihong
Date: Wed Nov 10 02:28:41 2010
New Revision: 1033330

URL: http://svn.apache.org/viewvc?rev=1033330&view=rev
Log:
Move the import configuration to the plan.xml

Modified:
    geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
    geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml

Modified: geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java?rev=1033330&r1=1033329&r2=1033330&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/myfaces/geronimo-myfaces-builder/src/main/java/org/apache/geronimo/myfaces/deployment/MyFacesModuleBuilderExtension.java
Wed Nov 10 02:28:41 2010
@@ -173,9 +173,6 @@ public class MyFacesModuleBuilderExtensi
         if (!hasFacesServlet(webApp)) {
             return;
         }
-        //This is a workaround for wired bundle cache in the BundleClassloader,
-        //add the import package explicitly to make sure the myface-core-impl is wired immediately
the application bundle is resolved
-        module.getEnvironment().addImportPackage("org.apache.myfaces.ee6");
 
         EARContext moduleContext = module.getEarContext();
         Map sharedContext = module.getSharedContext();

Modified: geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/plan/plan.xml?rev=1033330&r1=1033329&r2=1033330&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces-deployer/src/main/plan/plan.xml Wed Nov
10 02:28:41 2010
@@ -35,6 +35,11 @@
                         <type>car</type>
                     </dependency>
                 </dependencies>
+                <!--
+                This is a workaround for wired bundle cache in the BundleClassloader,
+                add the import package explicitly to make sure the myface-core-impl is wired
immediately the application bundle is resolved
+                -->
+                <import-package>org.apache.myfaces.ee6</import-package>
             </environment>
         </xml-attribute>
     </gbean>

Modified: geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml?rev=1033330&r1=1033329&r2=1033330&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/myfaces/myfaces/src/main/history/dependencies.xml Wed Nov
10 02:28:41 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>myfaces</artifactId>
@@ -52,6 +52,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-annotation_1.1_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-api</artifactId>
         <type>jar</type>



Mime
View raw message