You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by co...@apache.org on 2010/06/15 04:08:40 UTC

svn commit: r954693 - in /openwebbeans/trunk/samples/guess/src/main: resources/META-INF/beans.xml resources/META-INF/openwebbeans/openwebbeans.properties webapp/WEB-INF/beans.xml

Author: covener
Date: Tue Jun 15 02:08:40 2010
New Revision: 954693

URL: http://svn.apache.org/viewvc?rev=954693&view=rev
Log:
remove owb-specific beans.xml format from samples/guess

Modified:
    openwebbeans/trunk/samples/guess/src/main/resources/META-INF/beans.xml
    openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
    openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml

Modified: openwebbeans/trunk/samples/guess/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/resources/META-INF/beans.xml?rev=954693&r1=954692&r2=954693&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/resources/META-INF/beans.xml (original)
+++ openwebbeans/trunk/samples/guess/src/main/resources/META-INF/beans.xml Tue Jun 15 02:08:40 2010
@@ -17,7 +17,13 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<WebBeans 	xmlns="urn:java:ee"
- 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:schemaLocation="urn:java:ee http://java.sun.com/jee/beans-1.0.xsd">	
-</WebBeans>
\ No newline at end of file
+<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>
+   </interceptors>
+
+   <decorators>
+   </decorators>
+</beans>
+

Modified: openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties?rev=954693&r1=954692&r2=954693&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (original)
+++ openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/openwebbeans.properties Tue Jun 15 02:08:40 2010
@@ -25,8 +25,6 @@
 #general configuration section
 
 #use OWB Specific XML Configuration
-org.apache.webbeans.useOwbSpecificXmlConfig=true
-
 org.apache.webbeans.application.useJSF2Extensions=false
 
 org.apache.webbeans.spi.adaptor.ELAdaptor=org.apache.webbeans.el10.EL10Adaptor

Modified: openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml?rev=954693&r1=954692&r2=954693&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml (original)
+++ openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/beans.xml Tue Jun 15 02:08:40 2010
@@ -17,14 +17,13 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<WebBeans 	xmlns="urn:java:ee"
-			xmlns:myapp="urn:java:org.apache.webbeans.sample.bindings"
- 			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-			xsi:schemaLocation="urn:java:ee http://java.sun.com/jee/beans-1.0.xsd">
-	
-	<Deploy>
-		<Standard/>
-		<Production/>
-	</Deploy>
-		
-</WebBeans>
\ No newline at end of file
+<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>
+   </interceptors>
+
+   <decorators>
+   </decorators>
+</beans>
+