geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r664175 [5/13] - in /geronimo/samples/branches/2.1/samples: ./ app-per-port/ app-per-port/app-per-port-connector-war/ app-per-port/app-per-port-connector-war/src/main/webapp/WEB-INF/ app-per-port/app-per-port-ear/ app-per-port/app-per-port-...
Date Fri, 06 Jun 2008 22:43:53 GMT
Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/pom.xml Fri Jun  6 15:43:44 2008
@@ -96,7 +96,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -121,21 +121,21 @@
                     </useMavenDependencies>
                     <category>Sample</category>
                     <!--<instance>-->
-                        <!--<plugin-artifact>-->
-                            <!--<prerequisite>-->
-                                <!--<id>-->
-                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
-                                    <!--<artifactId>jetty6</artifactId>-->
-                                <!--</id>-->
-                                <!--<resource-type>Web Container</resource-type>-->
-                                <!--<description>-->
-                                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
-                                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
-                                    <!--There is a separate version of the application that works with Tomcat. -->
-                                    <!--Please install the version appropriate to your Geronimo distribution.-->
-                                <!--</description> -->
-                            <!--</prerequisite>-->
-                        <!--</plugin-artifact>-->
+                    <!--<plugin-artifact>-->
+                    <!--<prerequisite>-->
+                    <!--<id>-->
+                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                    <!--<artifactId>jetty6</artifactId>-->
+                    <!--</id>-->
+                    <!--<resource-type>Web Container</resource-type>-->
+                    <!--<description>-->
+                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
+                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
+                    <!--There is a separate version of the application that works with Tomcat. -->
+                    <!--Please install the version appropriate to your Geronimo distribution.-->
+                    <!--</description> -->
+                    <!--</prerequisite>-->
+                    <!--</plugin-artifact>-->
                     <!--</instance>-->
                 </configuration>
             </plugin>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-jetty/src/main/plan/plan.xml Fri Jun  6 15:43:44 2008
@@ -21,17 +21,17 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
 
- <context-root>/jaxws-calculator</context-root>
+    <context-root>/jaxws-calculator</context-root>
 
- <service-ref>
-   <service-ref-name>services/Calculator</service-ref-name>
-   <port>
-      <port-name>CalculatorPort</port-name>
-      <protocol>http</protocol>
-      <host>localhost</host>
-      <port>8080</port>
-      <uri>/jaxws-calculator/calculator</uri>
-   </port>
- </service-ref>
+    <service-ref>
+        <service-ref-name>services/Calculator</service-ref-name>
+        <port>
+            <port-name>CalculatorPort</port-name>
+            <protocol>http</protocol>
+            <host>localhost</host>
+            <port>8080</port>
+            <uri>/jaxws-calculator/calculator</uri>
+        </port>
+    </service-ref>
 
 </web-app>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/pom.xml Fri Jun  6 15:43:44 2008
@@ -45,7 +45,7 @@
             <type>war</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
@@ -97,7 +97,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -122,21 +122,21 @@
                     </useMavenDependencies>
                     <category>Sample</category>
                     <!--<instance>-->
-                        <!--<plugin-artifact>-->
-                            <!--<prerequisite>-->
-                                <!--<id>-->
-                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
-                                    <!--<artifactId>tomcat6</artifactId>-->
-                                <!--</id>-->
-                                <!--<resource-type>Web Container</resource-type>-->
-                                <!--<description>-->
-                                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
-                                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
-                                    <!--There is a separate version of the application that works with Jetty. -->
-                                    <!--Please install the version appropriate to your Geronimo distribution.-->
-                                <!--</description> -->
-                            <!--</prerequisite>-->
-                        <!--</plugin-artifact>-->
+                    <!--<plugin-artifact>-->
+                    <!--<prerequisite>-->
+                    <!--<id>-->
+                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                    <!--<artifactId>tomcat6</artifactId>-->
+                    <!--</id>-->
+                    <!--<resource-type>Web Container</resource-type>-->
+                    <!--<description>-->
+                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+                    <!--There is a separate version of the application that works with Jetty. -->
+                    <!--Please install the version appropriate to your Geronimo distribution.-->
+                    <!--</description> -->
+                    <!--</prerequisite>-->
+                    <!--</plugin-artifact>-->
                     <!--</instance>-->
                 </configuration>
             </plugin>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-tomcat/src/main/plan/plan.xml Fri Jun  6 15:43:44 2008
@@ -21,18 +21,18 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
 
- <context-root>/jaxws-calculator</context-root>
+    <context-root>/jaxws-calculator</context-root>
 
- <service-ref>
-   <service-ref-name>services/Calculator</service-ref-name>
-   <port>
-      <port-name>CalculatorPort</port-name>
-      <protocol>http</protocol>
-      <host>localhost</host>
-      <port>8080</port>
-      <uri>/jaxws-calculator/calculator</uri>
-   </port>
- </service-ref>
+    <service-ref>
+        <service-ref-name>services/Calculator</service-ref-name>
+        <port>
+            <port-name>CalculatorPort</port-name>
+            <protocol>http</protocol>
+            <host>localhost</host>
+            <port>8080</port>
+            <uri>/jaxws-calculator/calculator</uri>
+        </port>
+    </service-ref>
 
 </web-app>
 

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/pom.xml Fri Jun  6 15:43:44 2008
@@ -62,24 +62,24 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-war-plugin</artifactId>
-              <configuration>
-                  <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
-                  <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.wsdl, **/*.xsd, **/*.jsp, **/*.xml, **/*.class, **/*.html, META-INF/*</warSourceIncludes>
-                  <archiveClasses>true</archiveClasses>
-                  <archive>
-                     <manifest>
-                         <mainClass>org.apache.geronimo.samples.jws.client.CalculatorClient</mainClass>
-                         <addClasspath>false</addClasspath>
-                     </manifest>
-                  </archive>
-              </configuration>
-          </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                    <warSourceIncludes>WEB-INF/lib/${artifactId}-${version}.jar, **/*.wsdl, **/*.xsd, **/*.jsp, **/*.xml, **/*.class, **/*.html, META-INF/*</warSourceIncludes>
+                    <archiveClasses>true</archiveClasses>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.apache.geronimo.samples.jws.client.CalculatorClient</mainClass>
+                            <addClasspath>false</addClasspath>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
 
         </plugins>
     </build>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/Calculator.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/Calculator.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/Calculator.java (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/Calculator.java Fri Jun  6 15:43:44 2008
@@ -25,21 +25,20 @@
 import javax.xml.ws.RequestWrapper;
 import javax.xml.ws.ResponseWrapper;
 
-@WebService(name="CalculatorPortType",
-            targetNamespace = "http://jws.samples.geronimo.apache.org")
+@WebService(name = "CalculatorPortType",
+        targetNamespace = "http://jws.samples.geronimo.apache.org")
 public interface Calculator {
 
     /**
      * @param value1
      * @param value2
-     * @return 
-     *     returns int
-     * */
+     * @return returns int
+     */
     @WebMethod(operationName = "add")
     @WebResult(name = "return", targetNamespace = "http://jws.samples.geronimo.apache.org")
     @RequestWrapper(localName = "add", targetNamespace = "http://jws.samples.geronimo.apache.org", className = "org.apache.geronimo.samples.jws.Add")
-    @ResponseWrapper(localName = "addResponse", targetNamespace = "http://jws.samples.geronimo.apache.org", className = "org.apache.geronimo.samples.jws.AddResponse")   
-    public int add(@WebParam(name = "value1", targetNamespace = "http://jws.samples.geronimo.apache.org") int value1,
-                   @WebParam(name = "value2", targetNamespace = "http://jws.samples.geronimo.apache.org") int value2);
+    @ResponseWrapper(localName = "addResponse", targetNamespace = "http://jws.samples.geronimo.apache.org", className = "org.apache.geronimo.samples.jws.AddResponse")
+    public int add(@WebParam(name = "value1", targetNamespace = "http://jws.samples.geronimo.apache.org")int value1,
+                   @WebParam(name = "value2", targetNamespace = "http://jws.samples.geronimo.apache.org")int value2);
 
 }

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/CalculatorService.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/CalculatorService.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/CalculatorService.java (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/CalculatorService.java Fri Jun  6 15:43:44 2008
@@ -24,18 +24,17 @@
 import javax.xml.ws.WebServiceContext;
 
 @WebService(serviceName = "Calculator",
-            portName="CalculatorPort",
-            endpointInterface = "org.apache.geronimo.samples.jws.Calculator",
-            targetNamespace = "http://jws.samples.geronimo.apache.org",
-            wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl")
+        portName = "CalculatorPort",
+        endpointInterface = "org.apache.geronimo.samples.jws.Calculator",
+        targetNamespace = "http://jws.samples.geronimo.apache.org",
+        wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl")
 public class CalculatorService implements Calculator {
 
     @Resource
     private WebServiceContext context;
-    
+
     /**
-     * @return
-     *     returns javax.xml.ws.WebServiceContext
+     * @return returns javax.xml.ws.WebServiceContext
      */
     public WebServiceContext getContext() {
         return context;
@@ -44,8 +43,7 @@
     /**
      * @param value1
      * @param value2
-     * @return 
-     *     returns int
+     * @return returns int
      */
     public int add(int value1, int value2) {
         System.out.println("User Principal: " + context.getUserPrincipal());

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/client/CalculatorClient.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/client/CalculatorClient.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/client/CalculatorClient.java (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/java/org/apache/geronimo/samples/jws/client/CalculatorClient.java Fri Jun  6 15:43:44 2008
@@ -19,6 +19,7 @@
 package org.apache.geronimo.samples.jws.client;
 
 import java.net.URL;
+
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 
@@ -39,9 +40,9 @@
         URL url = new URL("http://localhost:8080/jaxws-calculator-war-2.0-SNAPSHOT/calculator?wsdl");
         QName qname = new QName("http://jws.samples.geronimo.apache.org", "Calculator");
         Service service = Service.create(url, qname);
-        
-        Calculator calc = (Calculator)service.getPort(Calculator.class);
-        
+
+        Calculator calc = (Calculator) service.getPort(Calculator.class);
+
         return calc.add(value1, value2);
     }
 }

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun  6 15:43:44 2008
@@ -17,26 +17,26 @@
 -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
 
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-    <dep:moduleId>
-      <dep:groupId>${pom.groupId}</dep:groupId>
-      <dep:artifactId>${pom.artifactId}</dep:artifactId>
-      <dep:version>${version}</dep:version>
-      <dep:type>war</dep:type>
-    </dep:moduleId>
-  </dep:environment>
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <dep:moduleId>
+            <dep:groupId>${pom.groupId}</dep:groupId>
+            <dep:artifactId>${pom.artifactId}</dep:artifactId>
+            <dep:version>${version}</dep:version>
+            <dep:type>war</dep:type>
+        </dep:moduleId>
+    </dep:environment>
 
- <context-root>/jaxws-calculator</context-root>
+    <context-root>/jaxws-calculator</context-root>
 
- <service-ref>
-   <service-ref-name>services/Calculator</service-ref-name>
-   <port>
-      <port-name>CalculatorPort</port-name>
-      <protocol>http</protocol>
-      <host>localhost</host>
-      <port>8080</port>
-      <uri>/jaxws-calculator/calculator</uri>
-   </port>
- </service-ref>
+    <service-ref>
+        <service-ref-name>services/Calculator</service-ref-name>
+        <port>
+            <port-name>CalculatorPort</port-name>
+            <protocol>http</protocol>
+            <host>localhost</host>
+            <port>8080</port>
+            <uri>/jaxws-calculator/calculator</uri>
+        </port>
+    </service-ref>
 
 </web-app>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/web.xml Fri Jun  6 15:43:44 2008
@@ -29,7 +29,7 @@
             org.apache.geronimo.samples.jws.CalculatorService
         </servlet-class>
     </servlet>
-	
+
     <servlet-mapping>
         <servlet-name>CalculatorService</servlet-name>
         <url-pattern>/calculator</url-pattern>
@@ -44,5 +44,5 @@
         <service-interface>javax.xml.ws.Service</service-interface>
         <wsdl-file>WEB-INF/wsdl/CalculatorService.wsdl</wsdl-file>
     </service-ref>
-	
+
 </web-app>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/wsdl/CalculatorService.wsdl
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/wsdl/CalculatorService.wsdl?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/wsdl/CalculatorService.wsdl (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/wsdl/CalculatorService.wsdl Fri Jun  6 15:43:44 2008
@@ -18,56 +18,56 @@
   under the License.
 -->
 <wsdl:definitions name="Calculator"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://jws.samples.geronimo.apache.org"
-    xmlns:tns="http://jws.samples.geronimo.apache.org">
+                  xmlns="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                  targetNamespace="http://jws.samples.geronimo.apache.org"
+                  xmlns:tns="http://jws.samples.geronimo.apache.org">
 
     <wsdl:types>
-        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                    xmlns="http://jws.samples.geronimo.apache.org" 
+        <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+                    xmlns="http://jws.samples.geronimo.apache.org"
                     targetNamespace="http://jws.samples.geronimo.apache.org"
                     attributeFormDefault="unqualified" elementFormDefault="qualified">
 
-             <xsd:element name="add">
+            <xsd:element name="add">
                 <xsd:complexType>
-                   <xsd:sequence>
-                      <xsd:element name="value1" type="xsd:int"/>
-                      <xsd:element name="value2" type="xsd:int"/>
-                   </xsd:sequence>
+                    <xsd:sequence>
+                        <xsd:element name="value1" type="xsd:int"/>
+                        <xsd:element name="value2" type="xsd:int"/>
+                    </xsd:sequence>
                 </xsd:complexType>
-             </xsd:element>
+            </xsd:element>
 
-             <xsd:element name="addResponse">
+            <xsd:element name="addResponse">
                 <xsd:complexType>
-                   <xsd:sequence>
-                      <xsd:element name="return" type="xsd:int"/>
-                   </xsd:sequence>
+                    <xsd:sequence>
+                        <xsd:element name="return" type="xsd:int"/>
+                    </xsd:sequence>
                 </xsd:complexType>
-             </xsd:element>
+            </xsd:element>
         </xsd:schema>
     </wsdl:types>
-  
+
     <wsdl:message name="add">
-       <wsdl:part name="add" element="tns:add"/>
+        <wsdl:part name="add" element="tns:add"/>
     </wsdl:message>
 
     <wsdl:message name="addResponse">
-       <wsdl:part name="addResponse" element="tns:addResponse"/>
+        <wsdl:part name="addResponse" element="tns:addResponse"/>
     </wsdl:message>
 
     <wsdl:portType name="CalculatorPortType">
-       <wsdl:operation name="add">
-         <wsdl:input name="add" message="tns:add"/>
-         <wsdl:output name="addResponse" message="tns:addResponse"/>
-       </wsdl:operation>
+        <wsdl:operation name="add">
+            <wsdl:input name="add" message="tns:add"/>
+            <wsdl:output name="addResponse" message="tns:addResponse"/>
+        </wsdl:operation>
     </wsdl:portType>
-        
+
     <wsdl:binding name="CalculatorSoapBinding" type="tns:CalculatorPortType">
         <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        
+
         <wsdl:operation name="add">
             <soap:operation soapAction="add" style="document"/>
             <wsdl:input name="add">
@@ -77,15 +77,15 @@
                 <soap:body use="literal"/>
             </wsdl:output>
         </wsdl:operation>
-                
+
     </wsdl:binding>
-  
+
     <wsdl:service name="Calculator">
         <wsdl:port name="CalculatorPort" binding="tns:CalculatorSoapBinding">
             <soap:address location="http://localhost:8080/jaxws-calculator-1.0/calculator"/>
         </wsdl:port>
     </wsdl:service>
-   
-    
+
+
 </wsdl:definitions>
 

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/add.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/add.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/add.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/add.jsp Fri Jun  6 15:43:44 2008
@@ -1,66 +1,67 @@
 <!--
-   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.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<%@ page import="javax.naming.InitialContext,javax.xml.ws.Service,org.apache.geronimo.samples.jws.Calculator"%>
-<html  xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %>
+<%@ page import="javax.naming.InitialContext,javax.xml.ws.Service,org.apache.geronimo.samples.jws.Calculator" %>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-  <title>Apache Geronimo Sample Application - JAX-WS Calculator</title>
-  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+    <title>Apache Geronimo Sample Application - JAX-WS Calculator</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
 </head>
 
 <BODY>
-  <font face="Verdana, Helvetica, Arial">
+<font face="Verdana, Helvetica, Arial">
+
+    <h3>This is a JAX-WS web service sample application. Please type the value 1 and value 2 below to see the add result.</h3>
 
-    <h3>This is a JAX-WS web service sample application.   Please type the value 1 and value 2 below to see the add result.</h3>
     <form action="add.jsp">
-        Value 1: <input type="text" name="value1">   Value 2: <input type="text" name="value2"> <input type="submit" value="Add">
+        Value 1: <input type="text" name="value1"> Value 2: <input type="text" name="value2"> <input type="submit" value="Add">
     </form>
     <br>
-<%
-    String value1 = request.getParameter( "value1" );
-    String value2 = request.getParameter( "value2" );
-
-    System.out.println(value1 + " " + value2);
-
-    if (value1 != null && value1.trim().length() > 0 &&
-        value2 != null && value2.trim().length() > 0) {
-
-        out.println("<h4>");
-
-        try {
-            int v1 = Integer.parseInt(value1);
-            int v2 = Integer.parseInt(value2);
-    
-            InitialContext ctx = new InitialContext();
-            Service service = (Service)ctx.lookup("java:comp/env/services/Calculator");
-            Calculator calc = service.getPort(Calculator.class);         
-            int sum = calc.add(v1, v2);
-            out.println("Result: " + v1 + " + " + v2 + " = " + sum);
-        } catch ( Exception e ) {
-            e.printStackTrace();
-            out.println("Error: " + e.getMessage());
-       }
-
-       out.println("</h4>");
-    }
-%>
+    <%
+        String value1 = request.getParameter("value1");
+        String value2 = request.getParameter("value2");
+
+        System.out.println(value1 + " " + value2);
+
+        if (value1 != null && value1.trim().length() > 0 &&
+                value2 != null && value2.trim().length() > 0) {
+
+            out.println("<h4>");
+
+            try {
+                int v1 = Integer.parseInt(value1);
+                int v2 = Integer.parseInt(value2);
+
+                InitialContext ctx = new InitialContext();
+                Service service = (Service) ctx.lookup("java:comp/env/services/Calculator");
+                Calculator calc = service.getPort(Calculator.class);
+                int sum = calc.add(v1, v2);
+                out.println("Result: " + v1 + " + " + v2 + " = " + sum);
+            } catch (Exception e) {
+                e.printStackTrace();
+                out.println("Error: " + e.getMessage());
+            }
+
+            out.println("</h4>");
+        }
+    %>
 
-  </FONT>
+</FONT>
 </body>
 </html>
 

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/header.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/header.html (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/header.html Fri Jun  6 15:43:44 2008
@@ -16,40 +16,42 @@
 -->
 
 <html>
-    <head>
-        <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
-        <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">   
-        <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script><title>Apache Geronimo Sample Applications</title>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    </head>
-    
-    <body onload="init()">
-        
-        <table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
-            <tbody>
-                <tr>
-                    <td valing="top" align="left">
-                        <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
-                    </td>
-                    <td width="100%">
-                        &nbsp;
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        
-        <table border="0" cellpadding="2" cellspacing="0" width="100%">
-            <tbody>
-                <tr class="topBar">
-                    <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
-                        &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/" title="Geronimo Documentation"target="_blank">Documentation</a> | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications"target="_blank">Sample Applications</a>
-                    </td>
-                    <td class="topBarDiv" align="left" nowrap="true" valign="middle">
-                        <a href="xref/index.html" target="source_window">Source Code</a> | <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
-                    </td>
-                </tr>
-            </tbody>
-        </table>
+<head>
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script>
+    <title>Apache Geronimo Sample Applications</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+</head>
 
-    </body>
+<body onload="init()">
+
+<table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tbody>
+        <tr>
+            <td valing="top" align="left">
+                <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
+            </td>
+            <td width="100%">
+                &nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<table border="0" cellpadding="2" cellspacing="0" width="100%">
+    <tbody>
+        <tr class="topBar">
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
+                &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/" title="Geronimo Documentation" target="_blank">Documentation</a>
+                | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications" target="_blank">Sample Applications</a>
+            </td>
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle">
+                <a href="xref/index.html" target="source_window">Source Code</a> | <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+</body>
 </html>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/index.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/index.html (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/index.html Fri Jun  6 15:43:44 2008
@@ -17,13 +17,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
 <html>
 <head>
-  <title>Apache Geronimo Sample Application</title>
-  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+    <title>Apache Geronimo Sample Application</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
 </head>
 
 <FRAMESET rows="86px,*" frameborder="0">
     <FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
     <FRAME src="./add.jsp" name="jaxwsSampleFrame" title="JAX-WS sample" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
 </FRAMESET>
-  
+
 </html>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml Fri Jun  6 15:43:44 2008
@@ -21,36 +21,36 @@
 <!-- $Rev: 550875 $ $Date: 2007-06-26 13:40:09 -0400 (Tue, 26 Jun 2007) $ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>jaxws-calculator</artifactId>
     <name>Geronimo Samples :: jaxws-calculator</name>
     <packaging>pom</packaging>
-    
+
     <description>
         Geronimo jaxws-calculator sample created from an archetype.
     </description>
-    
-   <modules>
+
+    <modules>
         <module>jaxws-calculator-war</module>
         <module>jaxws-calculator-jetty</module>
         <module>jaxws-calculator-tomcat</module>
     </modules>
 
-   <build>
+    <build>
         <plugins>
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
-                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                    <outputDirectory>${project.basedir}/docs</outputDirectory>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/pom.xml Fri Jun  6 15:43:44 2008
@@ -37,14 +37,14 @@
     <description>Geronimo Samples. EAR Module</description>
 
     <dependencies>
-         <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-ra</artifactId>
             <version>${geronimoVersion}</version>
             <type>rar</type>
-         </dependency>
+        </dependency>
 
-         <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>jms-mdb-sample-war</artifactId>
             <version>${version}</version>
@@ -68,13 +68,13 @@
                     <description>Geronimo Sample EAR for jms-mdb-sample</description>
                     <version>5</version>
                     <modules>
-                      <rarModule>
+                        <rarModule>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-activemq-ra</artifactId>
                             <bundleFileName>geronimo-activemq-ra-${geronimoVersion}.rar</bundleFileName>
                         </rarModule>
 
-                      <ejbModule>
+                        <ejbModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>jms-mdb-sample-ejb</artifactId>
                             <bundleFileName>jms-mdb-sample-ejb-${version}.jar</bundleFileName>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml Fri Jun  6 15:43:44 2008
@@ -30,7 +30,7 @@
         </moduleId>
     </environment>
     <module>
-       <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
-       <alt-dd>jms-resources.xml</alt-dd>
+        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
+        <alt-dd>jms-resources.xml</alt-dd>
     </module>
 </application>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml Fri Jun  6 15:43:44 2008
@@ -18,57 +18,57 @@
     under the License.
 -->
 <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-            <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <dep:moduleId>
-                    <dep:groupId>${pom.groupId}</dep:groupId>
-                    <dep:artifactId>jms-resources</dep:artifactId>
-                    <dep:version>${version}</dep:version>
-                    <dep:type>rar</dep:type>
-                </dep:moduleId>
-                <dep:dependencies>
-                    <dep:dependency>
-                        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>activemq-broker</dep:artifactId>
-                        <dep:type>car</dep:type>
-                    </dep:dependency>
-                </dep:dependencies>
-            </dep:environment>
-            <resourceadapter>
-                <resourceadapter-instance>
-                    <resourceadapter-name>jms-resources</resourceadapter-name>
-                    <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
-                        <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
-                    </nam:workmanager>
-                </resourceadapter-instance>
-                <outbound-resourceadapter>
-                    <connection-definition>
-                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                        <connectiondefinition-instance>
-                            <name>OrderConnectionFactory</name>
-                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-                            <connectionmanager>
-                                <xa-transaction>
-                                    <transaction-caching/>
-                                </xa-transaction>
-                                <single-pool>
-                                    <match-one/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                    </connection-definition>
-                </outbound-resourceadapter>
-            </resourceadapter>
-            <adminobject>
-                <adminobject-interface>javax.jms.Queue</adminobject-interface>
-                <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>OrderQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-            <adminobject>
-                <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
-            </adminobject>
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <dep:moduleId>
+            <dep:groupId>${pom.groupId}</dep:groupId>
+            <dep:artifactId>jms-resources</dep:artifactId>
+            <dep:version>${version}</dep:version>
+            <dep:type>rar</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+                <dep:artifactId>activemq-broker</dep:artifactId>
+                <dep:type>car</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+    </dep:environment>
+    <resourceadapter>
+        <resourceadapter-instance>
+            <resourceadapter-name>jms-resources</resourceadapter-name>
+            <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
+                <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
+            </nam:workmanager>
+        </resourceadapter-instance>
+        <outbound-resourceadapter>
+            <connection-definition>
+                <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                <connectiondefinition-instance>
+                    <name>OrderConnectionFactory</name>
+                    <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                    <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                    <connectionmanager>
+                        <xa-transaction>
+                            <transaction-caching/>
+                        </xa-transaction>
+                        <single-pool>
+                            <match-one/>
+                        </single-pool>
+                    </connectionmanager>
+                </connectiondefinition-instance>
+            </connection-definition>
+        </outbound-resourceadapter>
+    </resourceadapter>
+    <adminobject>
+        <adminobject-interface>javax.jms.Queue</adminobject-interface>
+        <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+        <adminobject-instance>
+            <message-destination-name>OrderQueue</message-destination-name>
+            <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
+        </adminobject-instance>
+    </adminobject>
+    <adminobject>
+        <adminobject-interface>javax.jms.Topic</adminobject-interface>
+        <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
+    </adminobject>
 </connector>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/pom.xml Fri Jun  6 15:43:44 2008
@@ -37,20 +37,20 @@
     <description>Geronimo Samples. EJB Module</description>
 
     <dependencies>
-                <dependency>
-                        <groupId>org.apache.activemq</groupId>
-                        <artifactId>activemq-core</artifactId>
-                        <version>4.1.1</version>
-                        <type>jar</type>
-                </dependency>
-
-                <dependency>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jms_1.1_spec</artifactId>
-                        <version>1.1.1</version>
-                        <type>jar</type>
-                        <scope>provided</scope>
-                </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>4.1.1</version>
+            <type>jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <version>1.1.1</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/java/org/apache/geronimo/samples/order/OrderRecvMDB.java Fri Jun  6 15:43:44 2008
@@ -16,8 +16,8 @@
  */
 package org.apache.geronimo.samples.order;
 
-import javax.ejb.MessageDriven;
 import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
@@ -26,11 +26,12 @@
 //
 // MessageDrivenBean that listens to items on the
 // 'OrderQueue' queue and processes them accordingly.
+
 //
 @MessageDriven(activationConfig = {
-                   @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-                   @ActivationConfigProperty(propertyName="destination", propertyValue="OrderQueue")
-               })
+@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+@ActivationConfigProperty(propertyName = "destination", propertyValue = "OrderQueue")
+        })
 public class OrderRecvMDB implements MessageListener {
 
     /*
@@ -41,8 +42,8 @@
     public void onMessage(Message message) {
         TextMessage textMessage = (TextMessage) message;
         try {
-            System.out.println("Order Received \n"+ textMessage.getText());
-        } catch ( JMSException e ) {
+            System.out.println("Order Received \n" + textMessage.getText());
+        } catch (JMSException e) {
             e.printStackTrace();
         }
     }

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Jun  6 15:43:44 2008
@@ -20,34 +20,34 @@
 
 <!-- $Rev$ $Date$ -->
 
-<openejb-jar 
-	xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
-	xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1" 
-	xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1" 
-	xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-	<sys:environment>
-		<sys:moduleId>			
-			<sys:groupId>${pom.groupId}</sys:groupId>
-			<sys:artifactId>${pom.artifactId}</sys:artifactId>
-			<sys:version>${version}</sys:version>
-			<sys:type>jar</sys:type>
-		</sys:moduleId>
-		<sys:dependencies>
-		<sys:dependency>
-			<sys:groupId>org.apache.geronimo.configs</sys:groupId>
-			<sys:artifactId>activemq-broker</sys:artifactId>
-			<sys:type>car</sys:type>
-		</sys:dependency>
-		</sys:dependencies>
-		<sys:hidden-classes/>
-		<sys:non-overridable-classes/>
-	</sys:environment>
-	<enterprise-beans>
-		<message-driven>
-			<ejb-name>OrderRecvMDB</ejb-name>
-			<resource-adapter>
-				<resource-link>jms-resources</resource-link>
-			</resource-adapter>
-		</message-driven>
-	</enterprise-beans>
+<openejb-jar
+        xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+        xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
+        xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
+        xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <sys:environment>
+        <sys:moduleId>
+            <sys:groupId>${pom.groupId}</sys:groupId>
+            <sys:artifactId>${pom.artifactId}</sys:artifactId>
+            <sys:version>${version}</sys:version>
+            <sys:type>jar</sys:type>
+        </sys:moduleId>
+        <sys:dependencies>
+            <sys:dependency>
+                <sys:groupId>org.apache.geronimo.configs</sys:groupId>
+                <sys:artifactId>activemq-broker</sys:artifactId>
+                <sys:type>car</sys:type>
+            </sys:dependency>
+        </sys:dependencies>
+        <sys:hidden-classes/>
+        <sys:non-overridable-classes/>
+    </sys:environment>
+    <enterprise-beans>
+        <message-driven>
+            <ejb-name>OrderRecvMDB</ejb-name>
+            <resource-adapter>
+                <resource-link>jms-resources</resource-link>
+            </resource-adapter>
+        </message-driven>
+    </enterprise-beans>
 </openejb-jar>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/pom.xml Fri Jun  6 15:43:44 2008
@@ -105,7 +105,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -131,21 +131,21 @@
                     </useMavenDependencies>
                     <category>Sample</category>
                     <!--<instance>-->
-                        <!--<plugin-artifact>-->
-                            <!--<prerequisite>-->
-                                <!--<id>-->
-                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
-                                    <!--<artifactId>jetty6</artifactId>-->
-                                <!--</id>-->
-                                <!--<resource-type>Web Container</resource-type>-->
-                                <!--<description>-->
-                                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
-                                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
-                                    <!--There is a separate version of the application that works with Tomcat. -->
-                                    <!--Please install the version appropriate to your Geronimo distribution.-->
-                                <!--</description> -->
-                            <!--</prerequisite>-->
-                        <!--</plugin-artifact>-->
+                    <!--<plugin-artifact>-->
+                    <!--<prerequisite>-->
+                    <!--<id>-->
+                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                    <!--<artifactId>jetty6</artifactId>-->
+                    <!--</id>-->
+                    <!--<resource-type>Web Container</resource-type>-->
+                    <!--<description>-->
+                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
+                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
+                    <!--There is a separate version of the application that works with Tomcat. -->
+                    <!--Please install the version appropriate to your Geronimo distribution.-->
+                    <!--</description> -->
+                    <!--</prerequisite>-->
+                    <!--</plugin-artifact>-->
                     <!--</instance>-->
                 </configuration>
             </plugin>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-jetty/src/main/plan/plan.xml Fri Jun  6 15:43:44 2008
@@ -22,8 +22,8 @@
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
     <module>
-       <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
-       <alt-dd>jms-resources.xml</alt-dd>
+        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
+        <alt-dd>jms-resources.xml</alt-dd>
     </module>
-   
+
 </application>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/pom.xml Fri Jun  6 15:43:44 2008
@@ -45,7 +45,7 @@
             <type>ear</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
@@ -105,7 +105,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -131,21 +131,21 @@
                     </useMavenDependencies>
                     <category>Sample</category>
                     <!--<instance>-->
-                        <!--<plugin-artifact>-->
-                            <!--<prerequisite>-->
-                                <!--<id>-->
-                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
-                                    <!--<artifactId>tomcat6</artifactId>-->
-                                <!--</id>-->
-                                <!--<resource-type>Web Container</resource-type>-->
-                                <!--<description>-->
-                                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
-                                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
-                                    <!--There is a separate version of the application that works with Jetty. -->
-                                    <!--Please install the version appropriate to your Geronimo distribution.-->
-                                <!--</description> -->
-                            <!--</prerequisite>-->
-                        <!--</plugin-artifact>-->
+                    <!--<plugin-artifact>-->
+                    <!--<prerequisite>-->
+                    <!--<id>-->
+                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                    <!--<artifactId>tomcat6</artifactId>-->
+                    <!--</id>-->
+                    <!--<resource-type>Web Container</resource-type>-->
+                    <!--<description>-->
+                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+                    <!--There is a separate version of the application that works with Jetty. -->
+                    <!--Please install the version appropriate to your Geronimo distribution.-->
+                    <!--</description> -->
+                    <!--</prerequisite>-->
+                    <!--</plugin-artifact>-->
                     <!--</instance>-->
                 </configuration>
             </plugin>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-tomcat/src/main/plan/plan.xml Fri Jun  6 15:43:44 2008
@@ -22,8 +22,8 @@
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
     <module>
-       <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
-       <alt-dd>jms-resources.xml</alt-dd>
+        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
+        <alt-dd>jms-resources.xml</alt-dd>
     </module>
-   
+
 </application>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/pom.xml Fri Jun  6 15:43:44 2008
@@ -44,11 +44,11 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -59,7 +59,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                              <echo>Copying site directory from parent</echo>
+                                <echo>Copying site directory from parent</echo>
                                 <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/java/org/apache/geronimo/samples/order/OrderSenderServlet.java Fri Jun  6 15:43:44 2008
@@ -19,13 +19,12 @@
 import java.io.IOException;
 
 import javax.annotation.Resource;
+import javax.jms.Connection;
 import javax.jms.ConnectionFactory;
+import javax.jms.JMSException;
+import javax.jms.MessageProducer;
 import javax.jms.Queue;
-import javax.jms.Connection;
 import javax.jms.Session;
-import javax.jms.MessageProducer;
-import javax.jms.TextMessage;
-import javax.jms.JMSException;
 import javax.jms.TextMessage;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -37,28 +36,28 @@
  */
 public class OrderSenderServlet extends HttpServlet {
 
-    @Resource(name="OrderConnectionFactory")
+    @Resource(name = "OrderConnectionFactory")
     private ConnectionFactory factory;
 
-    @Resource(name="OrderQueue")
+    @Resource(name = "OrderQueue")
     private Queue receivingQueue;
 
     @Override
     public void init() throws ServletException {
-        super.init();       
+        super.init();
     }
 
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-        manageOrders(req,res);
+        manageOrders(req, res);
     }
 
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-        doGet(req,res);
+        doGet(req, res);
     }
 
-    private void manageOrders(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException{
+    private void manageOrders(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
         String path = "/error.jsp";
         Connection connection = null;
         MessageProducer messageProducer = null;
@@ -69,47 +68,44 @@
             String qty = req.getParameter("quantity");
             String model = req.getParameter("model");
 
-            if ( !customerId.equals("") && !orderId.equals("") && !qty.equals("") ) {
+            if (!customerId.equals("") && !orderId.equals("") && !qty.equals("")) {
                 System.out.println("Start Sending Order Request");
                 path = "/order.jsp";
 
                 connection = factory.createConnection();
-                sess = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);   
+                sess = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
                 TextMessage msg = sess.createTextMessage("<CustomerId=" + customerId + " OrderId=" + orderId
-                                                         + " Quantity=" + qty + " Model=" + model + ">" );
+                        + " Quantity=" + qty + " Model=" + model + ">");
                 messageProducer = sess.createProducer(receivingQueue);
                 messageProducer.send(msg);
                 System.out.println("Order Request Send");
-            }
-            else {
+            } else {
                 String error = "";
 
-                if ( customerId.equals("") ) {
+                if (customerId.equals("")) {
                     error = "Customer Id cannot be empty";
-                }
-                else if ( orderId.equals("") ) {
+                } else if (orderId.equals("")) {
                     error = "Order Id cannot be empty";
-                }
-                else if ( qty.equals("") ) {
+                } else if (qty.equals("")) {
                     error = "Quantity cannot be empty";
                 }
-                req.setAttribute("error",error);
+                req.setAttribute("error", error);
             }
         }
-        catch ( Exception e ) {
-            System.out.println("Error "+e);
+        catch (Exception e) {
+            System.out.println("Error " + e);
             e.printStackTrace();
         }
         finally {
             try {
-                if ( messageProducer != null ) messageProducer.close();
-                if ( sess != null )sess.close();
-                if ( connection!= null )connection.close();
+                if (messageProducer != null) messageProducer.close();
+                if (sess != null) sess.close();
+                if (connection != null) connection.close();
             }
-            catch ( JMSException e ) {
+            catch (JMSException e) {
                 e.printStackTrace();
             }
         }
-        getServletContext().getRequestDispatcher(path).forward(req,res);
+        getServletContext().getRequestDispatcher(path).forward(req, res);
     }
 }

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/WEB-INF/web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/WEB-INF/web.xml Fri Jun  6 15:43:44 2008
@@ -21,9 +21,9 @@
 <!-- $Rev$ $Date$ -->
 
 <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">
+         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">
     <description>jms-mdb-sample Servlet Sample</description>
     <servlet>
         <servlet-name>OrderSenderServlet</servlet-name>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/error.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/error.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/error.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/error.jsp Fri Jun  6 15:43:44 2008
@@ -1,30 +1,31 @@
 <!--
-  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><TITLE>Error</TITLE></HEAD>
 <BODY>
-	<div align="center">
-		<H2>Error Occured !!!</H2>
-		<BR><BR>
-		<b><%= request.getAttribute("error") %></b>
-		<BR><BR>
-		<a href="../order/order.jsp">Home</a>
-	</div>
+<div align="center">
+    <H2>Error Occured !!!</H2>
+    <BR><BR>
+    <b><%= request.getAttribute("error") %>
+    </b>
+    <BR><BR>
+    <a href="../order/order.jsp">Home</a>
+</div>
 </BODY>
 </HTML>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/header.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/header.html (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/header.html Fri Jun  6 15:43:44 2008
@@ -16,40 +16,42 @@
 -->
 
 <html>
-    <head>
-        <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
-        <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">   
-        <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script><title>Apache Geronimo Sample Applications</title>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    </head>
-    
-    <body onload="init()">
-        
-        <table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
-            <tbody>
-                <tr>
-                    <td valing="top" align="left">
-                        <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
-                    </td>
-                    <td width="100%">
-                        &nbsp;
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        
-        <table border="0" cellpadding="2" cellspacing="0" width="100%">
-            <tbody>
-                <tr class="topBar">
-                    <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
-                        &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/" title="Geronimo Documentation"target="_blank">Documentation</a> | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications"target="_blank">Sample Applications</a>
-                    </td>
-                    <td class="topBarDiv" align="left" nowrap="true" valign="middle">
-                        <a href="xref/index.html" target="source_window">Source Code</a> | <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
-                    </td>
-                </tr>
-            </tbody>
-        </table>
+<head>
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script>
+    <title>Apache Geronimo Sample Applications</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+</head>
 
-    </body>
+<body onload="init()">
+
+<table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tbody>
+        <tr>
+            <td valing="top" align="left">
+                <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
+            </td>
+            <td width="100%">
+                &nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<table border="0" cellpadding="2" cellspacing="0" width="100%">
+    <tbody>
+        <tr class="topBar">
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
+                &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/" title="Geronimo Documentation" target="_blank">Documentation</a>
+                | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications" target="_blank">Sample Applications</a>
+            </td>
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle">
+                <a href="xref/index.html" target="source_window">Source Code</a> | <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+</body>
 </html>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/index.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/index.html (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/index.html Fri Jun  6 15:43:44 2008
@@ -17,13 +17,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
 <html>
 <head>
-  <title>Apache Geronimo Sample Application</title>
-  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+    <title>Apache Geronimo Sample Application</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
 </head>
 
 <FRAMESET rows="86px,*" frameborder="0">
     <FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
     <FRAME src="./order.jsp" name="sampleDocumentFrame" title="Order Management System" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
 </FRAMESET>
-  
+
 </html>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/order.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/order.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/order.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-war/src/main/webapp/order.jsp Fri Jun  6 15:43:44 2008
@@ -1,61 +1,62 @@
 <!--
-  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><TITLE>Welcome</TITLE></HEAD>
 <BODY>
-    <div div=true align="center">
-      <strong><H2>Welcome to the Order Management System</H2><br><br><br></strong>
+<div div=true align="center">
+    <strong><H2>Welcome to the Order Management System</H2><br><br><br></strong>
+
     <FORM method="POST" action="order">
-	<TABLE width="90%" border="0" style="background-color: cyan">
-	<TR>	
-	<TD><strong>Customer Id</strong></TD>
-	<TD><strong><INPUT type="text" name="customerId"></strong></TD>
-	</TR>
-	<TR>	
-	<TD><strong>Order Id</strong></TD>
-	<TD><strong><INPUT type="text" name="orderId"></strong></TD>
-	</TR>
-	<TR>
-	<TD><strong>Quantity</strong></TD>
-	<TD><strong><INPUT type="text" name="quantity"></strong></TD>
-	</TR>
-	<TR>	
-	<TD><strong>Model</strong></TD>
-	<TD>
-		<strong>
-		<SELECT name="model">
-		 	<OPTION value="101">Type 1</OPTION>
-		 	<OPTION value="102">Type 2</OPTION>
-		 	<OPTION value="103">Type 3</OPTION>
-		 	<OPTION value="104">Type 4</OPTION>
-		 	<OPTION value="105">Type 5</OPTION>
-		 	<OPTION value="106">Type 6</OPTION>
-		 	<OPTION value="107">Type 7</OPTION>
-		</SELECT>
-		</strong>
-	</TD>
-	</TR>	
-	</TABLE>
-	<BR><BR>
-	<INPUT type="submit" value="Order">
-	<INPUT type="reset" value="Cancel">
-	</FORM>
-    </div>
+        <TABLE width="90%" border="0" style="background-color: cyan">
+            <TR>
+                <TD><strong>Customer Id</strong></TD>
+                <TD><strong><INPUT type="text" name="customerId"></strong></TD>
+            </TR>
+            <TR>
+                <TD><strong>Order Id</strong></TD>
+                <TD><strong><INPUT type="text" name="orderId"></strong></TD>
+            </TR>
+            <TR>
+                <TD><strong>Quantity</strong></TD>
+                <TD><strong><INPUT type="text" name="quantity"></strong></TD>
+            </TR>
+            <TR>
+                <TD><strong>Model</strong></TD>
+                <TD>
+                    <strong>
+                        <SELECT name="model">
+                            <OPTION value="101">Type 1</OPTION>
+                            <OPTION value="102">Type 2</OPTION>
+                            <OPTION value="103">Type 3</OPTION>
+                            <OPTION value="104">Type 4</OPTION>
+                            <OPTION value="105">Type 5</OPTION>
+                            <OPTION value="106">Type 6</OPTION>
+                            <OPTION value="107">Type 7</OPTION>
+                        </SELECT>
+                    </strong>
+                </TD>
+            </TR>
+        </TABLE>
+        <BR><BR>
+        <INPUT type="submit" value="Order">
+        <INPUT type="reset" value="Cancel">
+    </FORM>
+</div>
 </BODY>
 </HTML>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/pom.xml Fri Jun  6 15:43:44 2008
@@ -21,23 +21,23 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>jms-mdb-sample</artifactId>
     <name>Geronimo Samples :: jms-mdb-sample</name>
     <packaging>pom</packaging>
-    
+
     <description>
         Geronimo jms-mdb-sample sample created from an archetype.
     </description>
-    
+
     <modules>
         <module>jms-mdb-sample-ejb</module>
         <module>jms-mdb-sample-war</module>
@@ -47,13 +47,13 @@
     </modules>
 
     <dependencies>
-                <dependency>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                        <version>1.1.1</version>
-                        <type>jar</type>
-                        <scope>provided</scope>
-                </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <version>1.1.1</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -62,7 +62,7 @@
                 <artifactId>maven-site-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
-                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                    <outputDirectory>${project.basedir}/docs</outputDirectory>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message