Return-Path: 
 <scm-return-47768-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 57DDB9340
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Fri, 18 Nov 2011 04:07:48 +0000 (UTC)
Received: (qmail 47965 invoked by uid 500); 18 Nov 2011 04:07:48 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 47931 invoked by uid 500); 18 Nov 2011 04:07:47 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 47918 invoked by uid 99); 18 Nov 2011 04:07:46 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2011 04:07:46 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2011 04:07:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3FC1E2388978;
	Fri, 18 Nov 2011 04:07:15 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1203480 - in /geronimo/daytrader/branches/3.0-beta: ./
 bin/dbscripts/derby/ javaee6/ javaee6/assemblies/
 javaee6/assemblies/daytrader-ear/
 javaee6/assemblies/daytrader-ear/src/main/java/
 javaee6/assemblies/daytrader-ear/src/main/resources/...
Date: Fri, 18 Nov 2011 04:07:14 -0000
To: scm@geronimo.apache.org
From: violalu@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111118040715.3FC1E2388978@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: violalu
Date: Fri Nov 18 04:07:13 2011
New Revision: 1203480

URL: http://svn.apache.org/viewvc?rev=1203480&view=rev
Log:
revert daytrader 3.0-beta-1, and update source license header

Removed:
    geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/java/
Modified:
    geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.bat
    geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.sh
    geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/pom.xml
    geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE
    geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml
    geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/pom.xml
    geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/pom.xml
    geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/src/main/resources/META-INF/NOTICE
    geronimo/daytrader/branches/3.0-beta/javaee6/modules/pom.xml
    geronimo/daytrader/branches/3.0-beta/javaee6/modules/utils/pom.xml
    geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml
    geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java
    geronimo/daytrader/branches/3.0-beta/javaee6/plans/pom.xml
    geronimo/daytrader/branches/3.0-beta/javaee6/pom.xml
    geronimo/daytrader/branches/3.0-beta/plugins/daytrader-derby-datasource/pom.xml
    geronimo/daytrader/branches/3.0-beta/plugins/daytrader-jms/pom.xml
    geronimo/daytrader/branches/3.0-beta/plugins/daytrader-tomcat/src/main/history/dependencies.xml
    geronimo/daytrader/branches/3.0-beta/plugins/pom.xml
    geronimo/daytrader/branches/3.0-beta/pom.xml

Modified: geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.bat
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.bat?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.bat (original)
+++ geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.bat Fri Nov 18 04:07:13 2011
@@ -25,12 +25,9 @@ if not "%GERONIMO_HOME%" == "" goto GERO
 @goto END
 :GERONIMO_OK
 
-set DERBY_PATH=%GERONIMO_HOME%\repository\org\apache\derby
-set DERBY_VER=10.4.2.0
-set CLASSPATH=%DERBY_PATH%\derby\%DERBY_VER%\derby-%DERBY_VER%.jar
-set CLASSPATH=%CLASSPATH%;%DERBY_PATH%\derbynet\%DERBY_VER%\derbynet-%DERBY_VER%.jar
-set CLASSPATH=%CLASSPATH%;%DERBY_PATH%\derbytools\%DERBY_VER%\derbytools-%DERBY_VER%.jar
-set CLASSPATH=%CLASSPATH%;%DERBY_PATH%\derbyclient\%DERBY_VER%\derbyclient-%DERBY_VER%.jar
+set DERBY_PATH=%GERONIMO_HOME%\repository\org\apache\geronimo\bundles\derby-all
+set DERBY_VER=10.6.1.0_1
+set CLASSPATH=%DERBY_PATH%\%DERBY_VER%\derby-all-%DERBY_VER%.jar
 
 @echo "Invoking IJ command line tool to create the database and tables...please wait"
 

Modified: geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.sh
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.sh?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.sh (original)
+++ geronimo/daytrader/branches/3.0-beta/bin/dbscripts/derby/createDerbyDB.sh Fri Nov 18 04:07:13 2011
@@ -27,12 +27,10 @@ then
   exit
 fi
 
-export DERBY_PATH=${GERONIMO_HOME}/repository/org/apache/derby
-export DERBY_VER=10.4.2.0
-export CLASSPATH=${DERBY_PATH}/derby/${DERBY_VER}/derby-${DERBY_VER}.jar
-export CLASSPATH=${CLASSPATH}:${DERBY_PATH}/derbynet/${DERBY_VER}/derbynet-${DERBY_VER}.jar
-export CLASSPATH=${CLASSPATH}:${DERBY_PATH}/derbytools/${DERBY_VER}/derbytools-${DERBY_VER}.jar
-export CLASSPATH=${CLASSPATH}:${DERBY_PATH}/derbyclient/${DERBY_VER}/derbyclient-${DERBY_VER}.jar
+export DERBY_PATH=${GERONIMO_HOME}/repository/org/apache/geronimo/bundles/derby-all
+export DERBY_VER=10.6.1.0_1
+export CLASSPATH=${DERBY_PATH}/${DERBY_VER}/derby-all-${DERBY_VER}.jar
+
 
 echo "Invoking IJ command line tool to create the database and tables...please wait"
 

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>assemblies</artifactId>
     <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-beta-1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.geronimo.daytrader.javaee6</groupId>

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/NOTICE Fri Nov 18 04:07:13 2011
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2010 The Apache Software Foundation
+Copyright 2003-2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/daytrader-ear/src/main/resources/META-INF/application.xml Fri Nov 18 04:07:13 2011
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <application 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/application_6.xsd" version="6">
   <application-name>daytrader</application-name>
   <description>DayTrader Stock Trading Performance Benchmark Sample</description>  

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/assemblies/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,10 +1,26 @@
 <?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.
+-->
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>javaee6</artifactId>
     <groupId>org.apache.geronimo.daytrader</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-beta-1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.geronimo.daytrader.javaee6</groupId>

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
     <artifactId>modules</artifactId>
     <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-beta-1-SNAPSHOT</version>
   </parent>
   
   <artifactId>entities</artifactId>

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/src/main/resources/META-INF/NOTICE?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/src/main/resources/META-INF/NOTICE (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/modules/entities/src/main/resources/META-INF/NOTICE Fri Nov 18 04:07:13 2011
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2010 The Apache Software Foundation
+Copyright 2003-2011 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/modules/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/modules/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/modules/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,10 +1,26 @@
 <?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.
+-->
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>javaee6</artifactId>
     <groupId>org.apache.geronimo.daytrader</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>    
+    <version>3.0-beta-1-SNAPSHOT</version>    
   </parent>
   <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
   <artifactId>modules</artifactId>  

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/modules/utils/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/modules/utils/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/modules/utils/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/modules/utils/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   
   <parent>
     <artifactId>modules</artifactId>
     <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-beta-1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.geronimo.daytrader.javaee6</groupId>

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,10 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>modules</artifactId>
     <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-beta-1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.geronimo.daytrader.javaee6</groupId>
@@ -90,7 +107,8 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>                    
                     <resources>
-                        <resource implementation="org.apache.maven.model.Resource">
+                        <resource
+                                implementation="org.apache.maven.model.Resource">
                             <filtering>true</filtering>
                             <directory>
                                 ${basedir}/src/main/webapp/WEB-INF

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/modules/web/src/main/java/org/apache/geronimo/daytrader/javaee6/web/TradeBuildDB.java Fri Nov 18 04:07:13 2011
@@ -1,3 +1,19 @@
+/**
+ *  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.
+ */
 package org.apache.geronimo.daytrader.javaee6.web;
 
 import java.io.BufferedReader;

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/plans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/plans/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/plans/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/plans/pom.xml Fri Nov 18 04:07:13 2011
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.geronimo.daytrader</groupId>
         <artifactId>javaee6</artifactId>
-        <version>3.0-beta-2-SNAPSHOT</version>
+        <version>3.0-beta-1-SNAPSHOT</version>
     </parent>
 
     <artifactId>plans</artifactId>

Modified: geronimo/daytrader/branches/3.0-beta/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/javaee6/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/javaee6/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/javaee6/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,10 +1,26 @@
 <?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.
+-->
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>daytrader-parent</artifactId>
     <groupId>org.apache.geronimo.daytrader</groupId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-beta-1-SNAPSHOT</version>
   </parent>
  
   <artifactId>javaee6</artifactId>

Modified: geronimo/daytrader/branches/3.0-beta/plugins/daytrader-derby-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/plugins/daytrader-derby-datasource/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/plugins/daytrader-derby-datasource/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/plugins/daytrader-derby-datasource/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,129 +1,129 @@
-<?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.
--->
-
-<!-- $Rev: 1055802 $ $Date: 2011-01-06 17:28:46 +0800 (Thu, 06 Jan 2011) $ -->
-<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">
-    <parent>
-        <groupId>org.apache.geronimo.daytrader</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0-beta-2-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-    <artifactId>daytrader-derby-datasource</artifactId>
-    <packaging>car</packaging>
-    <name>Daytrader :: Plugins :: Derby DataSource</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
-            <type>rar</type>
-            <version>1.7</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer-1_6</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>system-database</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                	<deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                        <type>rar</type>
-                    </module>
-                    <instance>
-                        <plugin-artifact>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-                                <artifactId>daytrader-db2-datasource</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
-                           <obsoletes>
-                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-                                <artifactId>daytrader-derby-datasource</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-                                <artifactId>daytrader-informix-datasource</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-informix-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-                                <artifactId>daytrader-mysql-datasource</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-mysql-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-                                <artifactId>daytrader-oracle-datasource</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-                                <artifactId>daytrader-postgre-datasource</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-postgre-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-                                <artifactId>daytrader-sqlserver-datasource</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?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.
+-->
+
+<!-- $Rev: 1055802 $ $Date: 2011-01-06 17:28:46 +0800 (Thu, 06 Jan 2011) $ -->
+<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">
+    <parent>
+        <groupId>org.apache.geronimo.daytrader</groupId>
+        <artifactId>plugins</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+    <artifactId>daytrader-derby-datasource</artifactId>
+    <packaging>car</packaging>
+    <name>Daytrader :: Plugins :: Derby DataSource</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <type>rar</type>
+            <version>1.7</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer-1_6</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>system-database</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                	<deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.tranql</groupId>
+                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                        <type>rar</type>
+                    </module>
+                    <instance>
+                        <plugin-artifact>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-db2-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-db2-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                           <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-derby-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-informix-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-informix-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-mysql-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-mysql-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-oracle-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-oracle-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-postgre-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-postgre-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-sqlserver-datasource</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car">org.apache.geronimo.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car</artifact-alias>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: geronimo/daytrader/branches/3.0-beta/plugins/daytrader-jms/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/plugins/daytrader-jms/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/plugins/daytrader-jms/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/plugins/daytrader-jms/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,103 +1,103 @@
-<?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.
--->
-
-<!-- $Rev: 1055802 $ $Date: 2011-01-06 17:28:46 +0800 (Thu, 06 Jan 2011) $ -->
-<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.daytrader</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0-beta-2-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-    <artifactId>daytrader-jms</artifactId>
-    <name>Daytrader :: Plugins :: JavaEE JMS Resource</name>
-    <packaging>car</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-activemq-ra</artifactId>
-            <type>rar</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-gbean-deployer</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer-1_6</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
-        </dependency>
-        
-       <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-broker-blueprint</artifactId>
-            <type>car</type>
-            <version>${geronimoVersion}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                	<deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <module>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-activemq-ra</artifactId>
-                        <type>rar</type>
-                    </module>
-                    <instance>
-                        <plugin-artifact>
-                            <obsoletes>
-                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
-                                <artifactId>daytrader-jms</artifactId>
-                            </obsoletes>
-                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-jms//car">org.apache.geronimo.daytrader.plugins/daytrader-jms/${pom.version}/car</artifact-alias>
-                        </plugin-artifact>
-                    </instance>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<?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.
+-->
+
+<!-- $Rev: 1055802 $ $Date: 2011-01-06 17:28:46 +0800 (Thu, 06 Jan 2011) $ -->
+<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.daytrader</groupId>
+        <artifactId>plugins</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+    <artifactId>daytrader-jms</artifactId>
+    <name>Daytrader :: Plugins :: JavaEE JMS Resource</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-activemq-ra</artifactId>
+            <type>rar</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>connector-deployer-1_6</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        
+       <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-broker-blueprint</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                	<deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-activemq-ra</artifactId>
+                        <type>rar</type>
+                    </module>
+                    <instance>
+                        <plugin-artifact>
+                            <obsoletes>
+                                <groupId>org.apache.geronimo.daytrader.plugins</groupId>
+                                <artifactId>daytrader-jms</artifactId>
+                            </obsoletes>
+                            <artifact-alias key="org.apache.geronimo.daytrader.plugins/daytrader-jms//car">org.apache.geronimo.daytrader.plugins/daytrader-jms/${pom.version}/car</artifact-alias>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Modified: geronimo/daytrader/branches/3.0-beta/plugins/daytrader-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/plugins/daytrader-tomcat/src/main/history/dependencies.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/plugins/daytrader-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/plugins/daytrader-tomcat/src/main/history/dependencies.xml Fri Nov 18 04:07:13 2011
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+    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.
+-->
 <plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.daytrader.plugins</groupId>

Modified: geronimo/daytrader/branches/3.0-beta/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/plugins/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/plugins/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/plugins/pom.xml Fri Nov 18 04:07:13 2011
@@ -1,182 +1,182 @@
-<?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.
--->
-<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.daytrader</groupId>
-        <artifactId>daytrader-parent</artifactId>
-        <version>3.0-beta-2-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.daytrader</groupId>
-    <artifactId>plugins</artifactId>
-    <name>DayTrader :: Plugins</name>
-    <packaging>pom</packaging>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-                <property>
-                    <name>default</name>
-                </property>
-            </activation>
-            <modules>
-                <module>daytrader-derby-datasource</module>        	
-                <module>daytrader-jms</module>
-                <!--<module>daytrader-jetty</module>
-                <module>daytrader-tomcat</module>-->
-            </modules>
-        </profile>
-        <!--
-            You can build the extra datasources in this profile if you have
-            the required JDBC artifacts from each DB vendor installed into
-            either your local repo or a private maven repo you have setup,
-            by supplying the URL on the mvn cmdline as:
-                -Dmaven.repo.drivers=http://my.local.repo
-        -->
-        <profile>
-            <id>all</id>
-            <activation>
-                <property>
-                    <name>all</name>
-                </property>
-            </activation>
-            <modules>
-                <module>daytrader-derby-datasource</module>
-                <module>daytrader-db2-datasource</module>
-                <module>daytrader-oracle-datasource</module>
-        	<module>daytrader-mysql-datasource</module>
-                <module>daytrader-informix-datasource</module>
-        	<module>daytrader-sqlserver-datasource</module>
-                <module>daytrader-postgre-datasource</module>        	
-                <!--<module>daytrader-jetty</module>
-                <module>daytrader-tomcat</module>-->
-            </modules>
-            <properties>
-                <maven.repo.drivers>http://not.a.real.repository</maven.repo.drivers>
-            </properties>
-            <repositories>
-                <repository>
-                    <id>maven.repo.drivers</id>
-                    <name>Private JDBC Driver Repository</name>
-                    <url>${maven.repo.drivers}</url>
-                    <layout>default</layout>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>true</enabled>
-                        <checksumPolicy>ignore</checksumPolicy>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-    </profiles>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <version>${geronimoVersion}</version>
-                <!-- Install as extention to allow 'car' packaging to be used. -->
-                <extensions>true</extensions>
-                <configuration>
-                    <archive>
-                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                    <url>http://geronimo.apache.org/</url>
-                    <author>The Apache Geronimo development community</author>
-                    <osiApproved>true</osiApproved>
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                        <useTransitiveDependencies>true</useTransitiveDependencies>
-                    </useMavenDependencies>
-                    <deploymentConfigs>
-                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
-                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
-                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
-                    </deploymentConfigs>
-                    <commonInstance>
-                        <plugin-artifact>
-                        <geronimo-version>${geronimoVersion}</geronimo-version>
-                            <!--<geronimo-version>2.2</geronimo-version>
-                            <geronimo-version>2.2.1-SNAPSHOT</geronimo-version>-->
-                            <jvm-version>1.5</jvm-version>
-                            <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repository.apache.org/snapshots/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                        </plugin-artifact>
-                    </commonInstance>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <!-- Allow any Java >= 1.5 -->
-                                <requireJavaVersion>
-                                    <version>[1.5,)</version>
-                                </requireJavaVersion>
-
-                                <!-- Allow any Maven >= 2.0.9 -->
-                                <requireMavenVersion>
-                                    <version>[2.0.9,)</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-idea-plugin</artifactId>
-                <configuration>
-                    <jdkName>1.5</jdkName>
-                    <linkModules>true</linkModules>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-</project>
+<?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.
+-->
+<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.daytrader</groupId>
+        <artifactId>daytrader-parent</artifactId>
+        <version>3.0-beta-1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.daytrader</groupId>
+    <artifactId>plugins</artifactId>
+    <name>DayTrader :: Plugins</name>
+    <packaging>pom</packaging>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>default</name>
+                </property>
+            </activation>
+            <modules>
+                <module>daytrader-derby-datasource</module>        	
+                <module>daytrader-jms</module>
+                <!--<module>daytrader-jetty</module>
+                <module>daytrader-tomcat</module>-->
+            </modules>
+        </profile>
+        <!--
+            You can build the extra datasources in this profile if you have
+            the required JDBC artifacts from each DB vendor installed into
+            either your local repo or a private maven repo you have setup,
+            by supplying the URL on the mvn cmdline as:
+                -Dmaven.repo.drivers=http://my.local.repo
+        -->
+        <profile>
+            <id>all</id>
+            <activation>
+                <property>
+                    <name>all</name>
+                </property>
+            </activation>
+            <modules>
+                <module>daytrader-derby-datasource</module>
+                <module>daytrader-db2-datasource</module>
+                <module>daytrader-oracle-datasource</module>
+        	<module>daytrader-mysql-datasource</module>
+                <module>daytrader-informix-datasource</module>
+        	<module>daytrader-sqlserver-datasource</module>
+                <module>daytrader-postgre-datasource</module>        	
+                <!--<module>daytrader-jetty</module>
+                <module>daytrader-tomcat</module>-->
+            </modules>
+            <properties>
+                <maven.repo.drivers>http://not.a.real.repository</maven.repo.drivers>
+            </properties>
+            <repositories>
+                <repository>
+                    <id>maven.repo.drivers</id>
+                    <name>Private JDBC Driver Repository</name>
+                    <url>${maven.repo.drivers}</url>
+                    <layout>default</layout>
+                    <snapshots>
+                        <enabled>false</enabled>
+                    </snapshots>
+                    <releases>
+                        <enabled>true</enabled>
+                        <checksumPolicy>ignore</checksumPolicy>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+    </profiles>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>${geronimoVersion}</version>
+                <!-- Install as extention to allow 'car' packaging to be used. -->
+                <extensions>true</extensions>
+                <configuration>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+                    <url>http://geronimo.apache.org/</url>
+                    <author>The Apache Geronimo development community</author>
+                    <osiApproved>true</osiApproved>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                        <useTransitiveDependencies>true</useTransitiveDependencies>
+                    </useMavenDependencies>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <commonInstance>
+                        <plugin-artifact>
+                        <geronimo-version>${geronimoVersion}</geronimo-version>
+                            <!--<geronimo-version>2.2</geronimo-version>
+                            <geronimo-version>2.2.1-SNAPSHOT</geronimo-version>-->
+                            <jvm-version>1.5</jvm-version>
+                            <jvm-version>1.6</jvm-version>
+                            <source-repository>~/.m2/repository/</source-repository>
+                            <source-repository>http://repository.apache.org/snapshots/</source-repository>
+                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
+                        </plugin-artifact>
+                    </commonInstance>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <!-- Allow any Java >= 1.5 -->
+                                <requireJavaVersion>
+                                    <version>[1.5,)</version>
+                                </requireJavaVersion>
+
+                                <!-- Allow any Maven >= 2.0.9 -->
+                                <requireMavenVersion>
+                                    <version>[2.0.9,)</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-idea-plugin</artifactId>
+                <configuration>
+                    <jdkName>1.5</jdkName>
+                    <linkModules>true</linkModules>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>

Modified: geronimo/daytrader/branches/3.0-beta/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/daytrader/branches/3.0-beta/pom.xml?rev=1203480&r1=1203479&r2=1203480&view=diff
==============================================================================
--- geronimo/daytrader/branches/3.0-beta/pom.xml (original)
+++ geronimo/daytrader/branches/3.0-beta/pom.xml Fri Nov 18 04:07:13 2011
@@ -26,20 +26,20 @@
 
     <groupId>org.apache.geronimo.daytrader</groupId>
     <artifactId>daytrader-parent</artifactId>
-    <version>3.0-beta-2-SNAPSHOT</version>
+    <version>3.0-beta-1-SNAPSHOT</version>
     <packaging>pom</packaging>
     
     <name>DayTrader :: Performance Benchmark Sample :: Java EE 6</name>    
     <description>Java EE 6.0 Performance Benchmark Sample Application</description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/branches/3.0-beta/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/branches/3.0-beta/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/branches/3.0-beta/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/daytrader/trunk/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/daytrader/trunk/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/daytrader/trunk/</url>
     </scm>
 
     <properties>        
-        <geronimoVersion>3.0-beta-1</geronimoVersion>
+        <geronimoVersion>3.0-beta-1-SNAPSHOT</geronimoVersion>
         <!-- set siteId to artifactId for any "top level" project rooting a website -->
         <siteId>daytrader</siteId>
         <openjpaVersion>2.1.0</openjpaVersion>
@@ -145,7 +145,7 @@
             <timezone>+8</timezone>
         </contributor>
     </contributors>
-    <dependencies />
+    <dependencies/>
     
     <organization>
         <name>Apache Software Foundation</name>
@@ -417,4 +417,4 @@
             </modules>
         </profile>
     </profiles> 
-</project>
+</project>
\ No newline at end of file