You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ho...@apache.org on 2006/12/11 17:53:47 UTC

svn commit: r485752 - in /geronimo/daytrader/trunk: modules/web/src/main/webapp/WEB-INF/ modules/web/src/main/webapp/WEB-INF/wsdl/ plans/

Author: hogstrom
Date: Mon Dec 11 08:53:46 2006
New Revision: 485752

URL: http://svn.apache.org/viewvc?view=rev&rev=485752
Log:
Additional license headers

Modified:
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServicesClient_mapping.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServices_mapping.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/webservices.xml
    geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/wsdl/TradeServices.wsdl
    geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServicesClient_mapping.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServicesClient_mapping.xml?view=diff&rev=485752&r1=485751&r2=485752
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServicesClient_mapping.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServicesClient_mapping.xml Mon Dec 11 08:53:46 2006
@@ -1,3 +1,4 @@
+<?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
@@ -14,7 +15,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <java-wsdl-mapping version="1.1" xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
     <package-mapping>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServices_mapping.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServices_mapping.xml?view=diff&rev=485752&r1=485751&r2=485752
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServices_mapping.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/TradeServices_mapping.xml Mon Dec 11 08:53:46 2006
@@ -1,3 +1,4 @@
+<?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
@@ -14,7 +15,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <java-wsdl-mapping version="1.1" xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
     <package-mapping>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=485752&r1=485751&r2=485752
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/geronimo-web.xml Mon Dec 11 08:53:46 2006
@@ -1,3 +1,5 @@
+<?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
@@ -14,7 +16,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
+
     <web-app xmlns="http://geronimo.apache.org/xml/ns/web"
         xmlns:naming="http://geronimo.apache.org/xml/ns/naming"
         configId="TradeWeb" parentId="Trade">

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml?view=diff&rev=485752&r1=485751&r2=485752
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/jboss-web.xml Mon Dec 11 08:53:46 2006
@@ -1,3 +1,5 @@
+<?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
@@ -14,7 +16,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
+
 <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.3//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
 
 <jboss-web>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml?view=diff&rev=485752&r1=485751&r2=485752
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml Mon Dec 11 08:53:46 2006
@@ -1,3 +1,5 @@
+<?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
@@ -14,10 +16,10 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <web-app version="2.4"
 	xmlns="http://java.sun.com/xml/ns/j2ee"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
 
       <display-name>DayTraderWeb</display-name>
       <filter>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/webservices.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/webservices.xml?view=diff&rev=485752&r1=485751&r2=485752
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/webservices.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/webservices.xml Mon Dec 11 08:53:46 2006
@@ -1,3 +1,5 @@
+<?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
@@ -14,7 +16,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
+
 <webservices version="1.1" xmlns="http://java.sun.com/xml/ns/j2ee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd">
     <webservice-description>

Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/wsdl/TradeServices.wsdl
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/wsdl/TradeServices.wsdl?view=diff&rev=485752&r1=485751&r2=485752
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/wsdl/TradeServices.wsdl (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/wsdl/TradeServices.wsdl Mon Dec 11 08:53:46 2006
@@ -1,3 +1,5 @@
+<?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
@@ -14,7 +16,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<?xml version="1.0" encoding="UTF-8"?>
 <wsdl:definitions targetNamespace="http://daytrader.samples.geronimo.apache.org" 
              xmlns:impl="http://daytrader.samples.geronimo.apache.org" 
              xmlns:intf="http://daytrader.samples.geronimo.apache.org" 

Modified: geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml?view=diff&rev=485752&r1=485751&r2=485752
==============================================================================
--- geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml (original)
+++ geronimo/daytrader/trunk/plans/daytrader-jpa-plan.xml Mon Dec 11 08:53:46 2006
@@ -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.
 -->
 
 <!-- $Rev$ $Date$ -->
@@ -22,7 +22,7 @@
     <environment>
         <moduleId>
             <groupId>org.apache.geronimo.daytrader</groupId>
-            <artifactId>daytrader-jetty</artifactId>
+            <artifactId>daytrader</artifactId>
             <version>1.2-SNAPSHOT</version>
             <type>car</type>
         </moduleId>
@@ -99,6 +99,7 @@
                 <session>
                     <ejb-name>KeySequenceEJB</ejb-name>
                     <jndi-name>ejb/KeySequenceEJB</jndi-name>
+                    <cache-size>100</cache-size>
                 </session>
 
 
@@ -571,7 +572,7 @@
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-jetty-streamer-client</artifactId>
+                    <artifactId>daytrader-streamer-client</artifactId>
                     <version>1.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
@@ -579,7 +580,7 @@
             <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-jetty-streamer-client-server</artifactId>
+                    <artifactId>daytrader-streamer-client-server</artifactId>
                     <version>1.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
@@ -640,7 +641,7 @@
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-jetty-ws-client</artifactId>
+                    <artifactId>daytrader-ws-client</artifactId>
                     <version>1.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
@@ -648,7 +649,7 @@
             <server-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <moduleId>
                     <groupId>org.apache.geronimo.daytrader</groupId>
-                    <artifactId>daytrader-jetty-ws-client-server</artifactId>
+                    <artifactId>daytrader-ws-client-server</artifactId>
                     <version>1.2-SNAPSHOT</version>
                     <type>car</type>
                 </moduleId>
@@ -788,13 +789,4 @@
 
         </connector>
     </ext-module>
-
-    <!--creates daytrader derby db -->
-    <gbean name="DaytraderResources" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
-        <attribute name="testSQL">select * from holdingejb where 1 = 2</attribute>
-        <attribute name="path">META-INF/daytrader.sql</attribute>
-        <reference name="DataSource">
-            <name>jdbc/TradeDataSource</name>
-        </reference>
-    </gbean>
 </application>