openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1598925 - in /openwebbeans/branches/owb_1.2.x/samples: conversation-sample/src/main/webapp/ conversation-sample/src/main/webapp/WEB-INF/ guess/src/main/webapp/ guess/src/site/ jsf2sample/ jsf2sample/src/main/webapp/ standalone-sample/src/a...
Date Sat, 31 May 2014 21:13:56 GMT
Author: struberg
Date: Sat May 31 21:13:55 2014
New Revision: 1598925

URL: http://svn.apache.org/r1598925
Log:
OWB-961 more sample fixes...

Modified:
    openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
    openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
    openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/index.jsp
    openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/listing.xhtml
    openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/conversation.xhtml
    openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/home.xhtml
    openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/index.html
    openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/login.xhtml
    openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/redirect.xhtml
    openwebbeans/branches/owb_1.2.x/samples/guess/src/site/site.xml
    openwebbeans/branches/owb_1.2.x/samples/jsf2sample/pom.xml
    openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/conversation.xhtml
    openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/counter.xhtml
    openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/index.html
    openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/assembly/dist-binary.xml
    openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/main/resources/META-INF/beans.xml
    openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml
    openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml

Modified: openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/faces-config.xml Sat May 31 21:13:55 2014
@@ -24,17 +24,17 @@ under the License.
  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
 
    <navigation-rule>
-    	<from-view-id>/buy.xhtml</from-view-id>
-    	<navigation-case>
-    		<from-outcome>toListingPage</from-outcome>
+        <from-view-id>/buy.xhtml</from-view-id>
+        <navigation-case>
+            <from-outcome>toListingPage</from-outcome>
                 <to-view-id>/listing.xhtml</to-view-id>
-    		<redirect/>
-    	</navigation-case>
+            <redirect/>
+        </navigation-case>
     </navigation-rule>
     
-    	 <application>
+         <application>
   <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
  </application>
     
-		
+
 </faces-config>

Modified: openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/WEB-INF/web.xml Sat May 31 21:13:55 2014
@@ -1,43 +1,43 @@
 <?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.
+
+    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.
 -->
 <web-app 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-app_2_5.xsd"
-	version="2.5">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+    version="2.5">
+
+    <context-param>
+        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+        <param-value>.xhtml</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>
+            org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
+    </listener>
+
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
 
-	<context-param>
-		<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-		<param-value>.xhtml</param-value>
-	</context-param>
-
-	<listener>
-		<listener-class>
-			org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
-	</listener>
-
-	<servlet>
-		<servlet-name>Faces Servlet</servlet-name>
-		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
-	
-	<servlet-mapping>
-		<servlet-name>Faces Servlet</servlet-name>
-		<url-pattern>*.jsf</url-pattern>
-	</servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.jsf</url-pattern>
+    </servlet-mapping>
 
 </web-app>
\ No newline at end of file

Modified: openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/index.jsp?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/index.jsp (original)
+++ openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/index.jsp Sat May 31 21:13:55 2014
@@ -1,18 +1,18 @@
 <!--
-	
-	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.
+
+    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.
 -->
 <html>
 <head>

Modified: openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/listing.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/listing.xhtml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/listing.xhtml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/conversation-sample/src/main/webapp/listing.xhtml Sat May 31 21:13:55 2014
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
 <!--
-	
-	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.
+
+    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.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" 
 xmlns:h="http://java.sun.com/jsf/html"
@@ -22,28 +22,28 @@ xmlns:f="http://java.sun.com/jsf/core">
 <head>
   <title>OpenWebBeans :: Examples</title>
 </head>
-<body>		
-	
-	<div style="margin-top: 10px;">
-		<h3>Current Shopping Card Content</h3>
-		<h:dataTable cellpadding="1" cellspacing="5" value="#{selectedItems}" var="item">
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Product Name" />
-				</f:facet>
-				<h:outputText value="#{item.name}" />
-			</h:column>
-			
-			<h:column>
-				<f:facet name="header">
-					<h:outputText value="Product Price" />
-				</f:facet>
-				<h:outputText value="#{item.price}" />
-			</h:column>
-			
-		</h:dataTable>
-	</div>
-						
+<body>
+
+    <div style="margin-top: 10px;">
+        <h3>Current Shopping Card Content</h3>
+        <h:dataTable cellpadding="1" cellspacing="5" value="#{selectedItems}" var="item">
+
+            <h:column>
+                <f:facet name="header">
+                    <h:outputText value="Product Name" />
+                </f:facet>
+                <h:outputText value="#{item.name}" />
+            </h:column>
+
+            <h:column>
+                <f:facet name="header">
+                    <h:outputText value="Product Price" />
+                </f:facet>
+                <h:outputText value="#{item.price}" />
+            </h:column>
+
+        </h:dataTable>
+    </div>
+
 </body>
 </html>
\ No newline at end of file

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/conversation.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/conversation.xhtml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/conversation.xhtml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/conversation.xhtml Sat May 31 21:13:55 2014
@@ -1,19 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-	
-	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.
+
+    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.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"
     xmlns:f="http://java.sun.com/jsf/core"
@@ -28,31 +28,31 @@
   
   <div id="container">
     <div id="content">
-		<h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
-		
-		<h:form>
-						
-			<div style="border:1px solid black;margin: 25px 75px;">
-			
-				<h:panelGrid columns="2">
-					
-					<h:outputLabel for="book">
-						<h:outputText value="Book Name : "></h:outputText>
-					</h:outputLabel>
-					<h:inputText id="book" value="#{shoppingCardBean.book}" required="true" requiredMessage="Please give a book name!"></h:inputText>
-					
-					<h:panelGroup>					
-						<h:commandButton action="#{shoppingCardBean.startConversation}" immediate="true" value="Start Conversation"></h:commandButton>
-						<h:commandButton action="#{shoppingCardBean.endConversation}" immediate="true" value="End Conversation"></h:commandButton>
-						<h:commandButton action="toRedirect" immediate="true" value="Redirect"></h:commandButton>
-					</h:panelGroup>
-					
-					<h:commandButton action="#{shoppingCardBean.addNewBook}" value="Add New Book"></h:commandButton>
-					
-				</h:panelGrid>
-			</div>
-		</h:form>
-	    </div>
+        <h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
+
+        <h:form>
+
+            <div style="border:1px solid black;margin: 25px 75px;">
+
+                <h:panelGrid columns="2">
+
+                    <h:outputLabel for="book">
+                        <h:outputText value="Book Name : "></h:outputText>
+                    </h:outputLabel>
+                    <h:inputText id="book" value="#{shoppingCardBean.book}" required="true" requiredMessage="Please give a book name!"></h:inputText>
+
+                    <h:panelGroup>
+                        <h:commandButton action="#{shoppingCardBean.startConversation}" immediate="true" value="Start Conversation"></h:commandButton>
+                        <h:commandButton action="#{shoppingCardBean.endConversation}" immediate="true" value="End Conversation"></h:commandButton>
+                        <h:commandButton action="toRedirect" immediate="true" value="Redirect"></h:commandButton>
+                    </h:panelGroup>
+
+                    <h:commandButton action="#{shoppingCardBean.addNewBook}" value="Add New Book"></h:commandButton>
+
+                </h:panelGrid>
+            </div>
+        </h:form>
+        </div>
     
   </div>
 </body>

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/home.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/home.xhtml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/home.xhtml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/home.xhtml Sat May 31 21:13:55 2014
@@ -1,19 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-	
-	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.
+
+    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.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"
     xmlns:f="http://java.sun.com/jsf/core"
@@ -28,16 +28,16 @@
   
   <div id="container">
     <div id="content">
-        <h:form>			       
+        <h:form>
 
-	   	<div align="right">
-			<h:commandLink value="Logout" action="#{logoutBean.logout}" immediate="true"></h:commandLink>
-		</div>
+           <div align="right">
+            <h:commandLink value="Logout" action="#{logoutBean.logout}" immediate="true"></h:commandLink>
+        </div>
    
-	   	<h2>
-			<h:outputText value="Hello #{currentUser.userName} #{currentUser.password}"></h:outputText>
-		</h2>
-		
+           <h2>
+            <h:outputText value="Hello #{currentUser.userName} #{currentUser.password}"></h:outputText>
+        </h2>
+
       <h1>Please guess a number...</h1>
    
           <div style="color: red">

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/index.html?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/index.html (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/index.html Sat May 31 21:13:55 2014
@@ -1,19 +1,19 @@
 <html>
 <!--
-	
-	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.
+
+    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.
 -->
 <head>
   <meta http-equiv="Refresh" content="0; URL=login.jsf">

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/login.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/login.xhtml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/login.xhtml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/login.xhtml Sat May 31 21:13:55 2014
@@ -1,19 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-	
-	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.
+
+    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.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"
     xmlns:f="http://java.sun.com/jsf/core"
@@ -28,36 +28,36 @@
   
   <div id="container">
     <div id="content">
-		<h:messages globalOnly="false" showSummary="true"></h:messages>
-		
-		<h:form id="form">
-			
-			<div align="center">
-				<h3>OpenWebBeans Examples</h3>
-				<span style="color:red;">User name : admin, Password : admin</span>
-			</div>
-			
-			<div align="center" style="border:1px solid black;">
-			
-				<h:panelGrid columns="2">
-					
-					<h:outputLabel for="userName">
-						<h:outputText value="User Name : "></h:outputText>
-					</h:outputLabel>
-					<h:inputText id="userName" value="#{loginBean.userName}"></h:inputText>
-
-					<h:outputLabel for="password">
-						<h:outputText value="Password : "></h:outputText>
-					</h:outputLabel>
-					<h:inputSecret id="password" value="#{loginBean.password}"></h:inputSecret>
-					
-					<h:commandButton action="#{loginBean.login}" value="Login"></h:commandButton>
-					<h:commandButton onclick="document.getElementById('form').reset(); return false;" value="Reset"></h:commandButton>
-					
-				</h:panelGrid>
-			</div>
-		</h:form>
-	    </div>
+        <h:messages globalOnly="false" showSummary="true"></h:messages>
+
+        <h:form id="form">
+
+            <div align="center">
+                <h3>OpenWebBeans Examples</h3>
+                <span style="color:red;">User name : admin, Password : admin</span>
+            </div>
+
+            <div align="center" style="border:1px solid black;">
+
+                <h:panelGrid columns="2">
+
+                    <h:outputLabel for="userName">
+                        <h:outputText value="User Name : "></h:outputText>
+                    </h:outputLabel>
+                    <h:inputText id="userName" value="#{loginBean.userName}"></h:inputText>
+
+                    <h:outputLabel for="password">
+                        <h:outputText value="Password : "></h:outputText>
+                    </h:outputLabel>
+                    <h:inputSecret id="password" value="#{loginBean.password}"></h:inputSecret>
+
+                    <h:commandButton action="#{loginBean.login}" value="Login"></h:commandButton>
+                    <h:commandButton onclick="document.getElementById('form').reset(); return false;" value="Reset"></h:commandButton>
+
+                </h:panelGrid>
+            </div>
+        </h:form>
+        </div>
     
   </div>
 </body>

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/redirect.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/redirect.xhtml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/redirect.xhtml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/src/main/webapp/redirect.xhtml Sat May 31 21:13:55 2014
@@ -1,19 +1,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
-	
-	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.
+
+    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.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml"
     xmlns:f="http://java.sun.com/jsf/core"
@@ -28,23 +28,23 @@
   
   <div id="container">
     <div id="content">
-		<h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
-		
-		<h:form id="form">
-			
-			<div style="border:1px solid black;margin: 25px 75px;">
-			
-				<h:panelGrid columns="2">
-					
-					<h:outputLabel>
-						<h:outputText value="Redirected Books : "></h:outputText>
-					</h:outputLabel>
-					<h:outputText value="#{shoppingCardBean.books}" />					
-					
-				</h:panelGrid>
-			</div>
-		</h:form>
-	    </div>
+        <h:messages globalOnly="false" showSummary="true" infoStyle="font-weight:bold;"></h:messages>
+
+        <h:form id="form">
+
+            <div style="border:1px solid black;margin: 25px 75px;">
+
+                <h:panelGrid columns="2">
+
+                    <h:outputLabel>
+                        <h:outputText value="Redirected Books : "></h:outputText>
+                    </h:outputLabel>
+                    <h:outputText value="#{shoppingCardBean.books}" />
+
+                </h:panelGrid>
+            </div>
+        </h:form>
+        </div>
     
   </div>
 </body>

Modified: openwebbeans/branches/owb_1.2.x/samples/guess/src/site/site.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/guess/src/site/site.xml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/guess/src/site/site.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/guess/src/site/site.xml Sat May 31 21:13:55 2014
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <!--
-	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.
+    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.
 -->
 
 <project name="OpenWebBeans-Samples-Guess">
@@ -31,7 +31,7 @@
             <item name="Introduction" href="index.html" />
         </menu>
 
-    	<menu ref="reports"/>
+        <menu ref="reports"/>
     </body>
 </project>
 

Modified: openwebbeans/branches/owb_1.2.x/samples/jsf2sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/jsf2sample/pom.xml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/jsf2sample/pom.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/jsf2sample/pom.xml Sat May 31 21:13:55 2014
@@ -50,7 +50,7 @@ under the License.
             <version>${project.version}</version>
         </dependency>
         
-	<!-- Interceptor API -->
+    <!-- Interceptor API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-interceptor_1.1_spec</artifactId>
@@ -116,12 +116,8 @@ under the License.
         <finalName>jsf2sample</finalName>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>tomcat-maven-plugin</artifactId>
-                <version>1.1</version>
-                <configuration>
-                    <url>http://localhost:8080/manager/text</url>
-                </configuration>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

Modified: openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/conversation.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/conversation.xhtml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/conversation.xhtml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/conversation.xhtml Sat May 31 21:13:55 2014
@@ -1,65 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
 <!--
-	
-	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.
+
+    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.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html">
 <h:head>
-	<title>JSF2 Ajax with OpenWebBeans Demo</title>
+    <title>JSF2 Ajax with OpenWebBeans Demo</title>
 </h:head>
 <h:body>
-	
-	<div>
-	<h3>JSF2 Conversation Demo</h3>
-	<p>
-		Number will be increased each time user press <b>Show Number</b> button if conversation is in progress. Initial number set to <b>10</b>
-	</p>
-	</div>
-	
-	<ul>
-	<li><h4>Click <b style="color: red;">Start Conversation</b> to start conversation </h4></li>
-	<li><h4>Click <b style="color: red;">End Conversation</b> to end conversation </h4></li>
-	<li><h4>Click <b style="color: red;">Show Number</b> to show number in the current conversation </h4></li>
-	</ul>
-
-	<h:form id="form">
-		
-		<h:outputScript name="jsf.js" library="javax.faces" target="body"></h:outputScript>		
-		
-		<div>		
-			<h:outputText value="Current Number  : " style="color:red;"/>
-			<h:outputText value="#{conversationBean.current}" id="status" style="font-weight:bold;" />
-		</div>
-
-		<div style="margin-top: 10px;">
-			<h:outputText value="#{conversationBean.message}" id="message" style="font-weight:bold;" />			
-		</div>		
-			
-		<div style="margin-top: 10px;">
-			<h:commandButton id="button1" value="Start Conversation" action="#{conversationBean.startConversation}">
-			</h:commandButton>
-			
-			<h:commandButton id="button2" value="End Conversation" action="#{conversationBean.stopConversation}">
-			</h:commandButton>
-			
-			<h:commandButton id="button3" value="Show Number" action="#{conversationBean.conversationLive}">
-			</h:commandButton>							
-		</div>
-				
-	</h:form>
+
+    <div>
+        <h3>JSF2 Conversation Demo</h3>
+        <p>
+            Number will be increased each time user press <b>Show Number</b> button if conversation is in progress. Initial number set to <b>10</b>
+        </p>
+    </div>
+
+    <ul>
+        <li><h4>Click <b style="color: red;">Start Conversation</b> to start conversation </h4></li>
+        <li><h4>Click <b style="color: red;">End Conversation</b> to end conversation </h4></li>
+        <li><h4>Click <b style="color: red;">Show Number</b> to show number in the current conversation </h4></li>
+    </ul>
+
+    <h:form id="form">
+
+        <div>
+            <h:outputText value="Current Number  : " style="color:red;"/>
+            <h:outputText value="#{conversationBean.current}" id="status" style="font-weight:bold;" />
+        </div>
+
+        <div style="margin-top: 10px;">
+            <h:outputText value="#{conversationBean.message}" id="message" style="font-weight:bold;" />
+        </div>
+
+        <div style="margin-top: 10px;">
+            <h:commandButton id="button1" value="Start Conversation" action="#{conversationBean.startConversation}">
+            </h:commandButton>
+
+            <h:commandButton id="button2" value="End Conversation" action="#{conversationBean.stopConversation}">
+            </h:commandButton>
+
+            <h:commandButton id="button3" value="Show Number" action="#{conversationBean.conversationLive}">
+            </h:commandButton>
+        </div>
+
+    </h:form>
 
 </h:body>
 </html>
\ No newline at end of file

Modified: openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/counter.xhtml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/counter.xhtml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/counter.xhtml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/counter.xhtml Sat May 31 21:13:55 2014
@@ -1,45 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
 <!--
-	
-	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.
+
+    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.
 -->
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html">
 <h:head>
-	<title>JSF2 Ajax with OpenWebBeans Demo</title>
+    <title>JSF2 Ajax with OpenWebBeans Demo</title>
 </h:head>
 <h:body>
-	
-	<h3>JSF2 Ajax Demo :: Click <b>Count</b> button to inrease your count</h3>
 
-	<h:form id="form">
-		
-		<h:outputScript name="jsf.js" library="javax.faces" target="body"></h:outputScript>
-			
-		<div>
-			<h:commandButton id="button1" value="Count..." actionListener="#{helloBean.processAction}"
-			    onclick="jsf.ajax.request(this,event, {execute:'form:button1',render:'form:status'});return false;">
-			</h:commandButton>
-		
-		</div>
-		
-		<div>		
-			<h:outputText value="Counter Number : " />
-			<h:outputText value="#{helloBean.count}" id="status" />
-		</div>
-	</h:form>
+    <h3>JSF2 Ajax Demo :: Click <b>Count</b> button to inrease your count</h3>
+
+    <h:form id="form">
+
+        <h:outputScript name="jsf.js" library="javax.faces" target="body"></h:outputScript>
+
+        <div>
+            <h:commandButton id="button1" value="Count..." actionListener="#{helloBean.processAction}"
+                             onclick="jsf.ajax.request(this,event, {execute:'form:button1',render:'form:status'});return false;">
+            </h:commandButton>
+
+        </div>
+
+        <div>
+            <h:outputText value="Counter Number : " />
+            <h:outputText value="#{helloBean.count}" id="status" />
+        </div>
+    </h:form>
 
 </h:body>
 </html>
\ No newline at end of file

Modified: openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/index.html?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/index.html (original)
+++ openwebbeans/branches/owb_1.2.x/samples/jsf2sample/src/main/webapp/index.html Sat May 31 21:13:55 2014
@@ -1,21 +1,21 @@
 <!--
-	
-	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.
+
+    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.
 -->
 <html>
 <head>
-<meta HTTP-EQUIV="REFRESH" content="0; url=counter.jsf">
+<meta HTTP-EQUIV="REFRESH" content="0; url=counter.xhtml">
 </head>
 </html>

Modified: openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/assembly/dist-binary.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/assembly/dist-binary.xml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/assembly/dist-binary.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/assembly/dist-binary.xml Sat May 31 21:13:55 2014
@@ -27,30 +27,30 @@ under the License.
     <includeBaseDirectory>false</includeBaseDirectory>
 
     <dependencySets>
-		
-		<dependencySet>
+
+        <dependencySet>
             <outputDirectory/>
             <includes>
                 <include>org.apache.openwebbeans:standalone-sample</include>
             </includes>
         </dependencySet>
-		
-		
+
+
         <dependencySet>
             <outputDirectory></outputDirectory>
             <includes>
                 <include>org.apache.openwebbeans:openwebbeans-impl</include>
                 <include>org.apache.openwebbeans:openwebbeans-spi</include>
                 <include>org.apache.geronimo.specs:geronimo-el_2.2_spec</include>
-				<include>org.apache.geronimo.specs:geronimo-interceptor_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-interceptor_1.1_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec</include>
                 <include>org.apache.geronimo.specs:geronimo-jcdi_1.0_spec</include>
-				<include>dom4j:dom4j</include>
+                <include>dom4j:dom4j</include>
             </includes>
-	    <excludes>
-			<exclude>org.apache.openwebbeans:openwebbeans-spi:jar:sources</exclude>
-			<exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude>
-	    </excludes>
+        <excludes>
+            <exclude>org.apache.openwebbeans:openwebbeans-spi:jar:sources</exclude>
+            <exclude>org.apache.openwebbeans:openwebbeans-impl:jar:sources</exclude>
+        </excludes>
         </dependencySet>
 
 

Modified: openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/main/resources/META-INF/beans.xml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/main/resources/META-INF/beans.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/standalone-sample/src/main/resources/META-INF/beans.xml Sat May 31 21:13:55 2014
@@ -1,17 +1,17 @@
-	<!--
+    <!--
 
-		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
+        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></beans>
\ No newline at end of file
+        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></beans>
\ No newline at end of file

Modified: openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/tomcat-sample/src/main/webapp/WEB-INF/web.xml Sat May 31 21:13:55 2014
@@ -1,19 +1,19 @@
 <?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.
+
+    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.
 -->
 <web-app version="2.5" 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-app_2_5.xsd">

Modified: openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml?rev=1598925&r1=1598924&r2=1598925&view=diff
==============================================================================
--- openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/branches/owb_1.2.x/samples/tomcat7-sample/src/main/webapp/WEB-INF/web.xml Sat May 31 21:13:55 2014
@@ -1,19 +1,19 @@
 <?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.
+
+    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.
 -->
 <web-app version="2.5" 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-app_2_5.xsd">



Mime
View raw message