You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/07/15 14:07:17 UTC

svn commit: r964397 - in /myfaces/extensions/cdi/trunk: core/api/src/main/config/ core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ core/api/src/main/resources/META-INF/ core/impl/src/main/config/ core/impl/src/main/...

Author: struberg
Date: Thu Jul 15 12:07:15 2010
New Revision: 964397

URL: http://svn.apache.org/viewvc?rev=964397&view=rev
Log:
drop 'config' folder and move all to standard maven resource handling

Added:
    myfaces/extensions/cdi/trunk/core/api/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/core/api/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/services/
    myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/faces-config.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml
    myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/resources/META-INF/beans.xml
    myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/resources/META-INF/
    myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/resources/META-INF/beans.xml
Removed:
    myfaces/extensions/cdi/trunk/core/api/src/main/config/
    myfaces/extensions/cdi/trunk/core/impl/src/main/config/
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/config/
    myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/config/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/config/
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/config/
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/config/
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/config/
    myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/config/
    myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/config/beans.xml
Modified:
    myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationScoped.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml
    myfaces/extensions/cdi/trunk/parent/pom.xml

Modified: myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationScoped.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationScoped.java?rev=964397&r1=964396&r2=964397&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationScoped.java (original)
+++ myfaces/extensions/cdi/trunk/core/api/src/main/java/org/apache/myfaces/extensions/cdi/core/api/scope/conversation/ConversationScoped.java Thu Jul 15 12:07:15 2010
@@ -39,4 +39,4 @@ import static java.lang.annotation.Reten
 @Documented
 public @interface ConversationScoped
 {
-}                 
+}

Added: myfaces/extensions/cdi/trunk/core/api/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
    (empty)

Added: myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/beans.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<beans/>
\ No newline at end of file

Added: myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (added)
+++ myfaces/extensions/cdi/trunk/core/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Thu Jul 15 12:07:15 2010
@@ -0,0 +1,24 @@
+#####################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#####################################################################################
+
+# support for @ProjectStageActivated
+org.apache.myfaces.extensions.cdi.core.impl.projectstage.ProjectStageActivationExtension
+
+# myfaces-codi BeanManager provider
+org.apache.myfaces.extensions.cdi.core.api.manager.BeanManagerProvider
\ No newline at end of file

Added: myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/api/src/main/resources/META-INF/beans.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>

Added: myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/bv-module/impl/src/main/resources/META-INF/beans.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+</beans>

Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/src/main/resources/META-INF/beans.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>

Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/beans.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+    <interceptors>
+        <class>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.phase.ViewControllerInterceptor</class>
+    </interceptors>
+</beans>

Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Thu Jul 15 12:07:15 2010
@@ -0,0 +1,22 @@
+#####################################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#####################################################################################
+
+org.apache.myfaces.extensions.cdi.javaee.jsf.impl.listener.phase.PhaseListenerExtension
+
+org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.GroupedConversationContextExtension
\ No newline at end of file

Added: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/faces-config.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/faces-config.xml (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/resources/faces-config.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,34 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<faces-config version="1.2"
+              xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:xi="http://www.w3.org/2001/XInclude"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+
+    <application>
+        <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.AccessScopeAwareNavigationHandler</navigation-handler>
+    </application>
+
+    <factory>
+        <faces-context-factory>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.CodiFacesContextFactory</faces-context-factory>
+        <render-kit-factory>org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation.CodiRenderKitFactory</render-kit-factory>
+    </factory>
+</faces-config>
\ No newline at end of file

Added: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/src/main/resources/META-INF/beans.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml?rev=964397&r1=964396&r2=964397&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml Thu Jul 15 12:07:15 2010
@@ -137,6 +137,21 @@
                             <include>org.apache.myfaces.extensions.cdi.jee-modules:myfaces-extcdi-jsf12-module-impl</include>
                         </includes>
                     </artifactSet>
+<!--
+                    <filters>
+                      <filter>
+                          <artifact>org.apache.myfaces.extensions.cdi.jee-modules:myfaces-extcdi-jsf12-module-impl</artifact>
+                          <excludes>
+                              <exclude>/META-INF/faces-config.xml</exclude>
+                              <exclude>/META-INF/beans.xml</exclude>
+                              <exclude>/META-INF/services/javax.enterprise.inject.spi.Extension</exclude>
+                          </excludes>
+                      </filter>
+                    </filters>
+-->
+                    <transformers>
+                        <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+                    </transformers>
                 </configuration>
             </plugin>
         </plugins>

Added: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/resources/META-INF/faces-config.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,33 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
+              version="2.0">
+
+    <application>
+        <navigation-handler>org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation.AccessScopeAwareNavigationHandler</navigation-handler>
+    </application>
+
+    <factory>
+        <faces-context-factory>org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.request.CodiFacesContextFactory</faces-context-factory>
+        <render-kit-factory>org.apache.myfaces.extensions.cdi.javaee.jsf2.impl.scope.conversation.CodiRenderKitFactory</render-kit-factory>
+    </factory>
+</faces-config>
\ No newline at end of file

Added: myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/api/src/main/resources/META-INF/beans.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+</beans>

Added: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/resources/META-INF/beans.xml?rev=964397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/resources/META-INF/beans.xml (added)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/resources/META-INF/beans.xml Thu Jul 15 12:07:15 2010
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<beans/>
\ No newline at end of file

Modified: myfaces/extensions/cdi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/parent/pom.xml?rev=964397&r1=964396&r2=964397&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/parent/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/parent/pom.xml Thu Jul 15 12:07:15 2010
@@ -256,20 +256,6 @@
 
 
     <build>
-        <resources>
-            <resource>
-                <directory>${basedir}</directory>
-                <targetPath>META-INF</targetPath>
-                <includes>
-                    <include>NOTICE.txt</include>
-                    <include>LICENSE.txt</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-
         <pluginManagement>
             <plugins>
                 <plugin>