You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/06/25 08:33:49 UTC
svn commit: r957816 [4/12] - in /geronimo/samples/branches/3.0-M1: ./
samples/ samples/all-samples/all-samples-jetty/
samples/all-samples/all-samples-tomcat/ samples/daytrader/
samples/daytrader/assemblies/ samples/daytrader/assemblies/javaee/
samples/...
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-informix-datasource/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -1,77 +1,77 @@
-<?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$ $Date$ -->
-
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jdbc/TradeDataSource</name>
- <config-property-setting name="IfxHost">localhost</config-property-setting>
- <config-property-setting name="ServerName">ol_ids_1150_1</config-property-setting>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <config-property-setting name="PortNumber">1526</config-property-setting>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="IfxSQLHostType"/>
- <config-property-setting name="IfxSQLHostFile"/>
- <config-property-setting name="IfxProtocolTrace"/>
- <config-property-setting name="IfxProtocolTraceFile"/>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>100</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- <connectiondefinition-instance>
- <name>jdbc/NoTxTradeDataSource</name>
- <config-property-setting name="IfxHost">localhost</config-property-setting>
- <config-property-setting name="ServerName">ol_ids_1150_1</config-property-setting>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <config-property-setting name="PortNumber">1526</config-property-setting>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="IfxSQLHostType"/>
- <config-property-setting name="IfxSQLHostFile"/>
- <config-property-setting name="IfxProtocolTrace"/>
- <config-property-setting name="IfxProtocolTraceFile"/>
- <connectionmanager>
- <no-transaction/>
- <single-pool>
- <max-size>10</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-</connector>
+<?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$ $Date$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jdbc/TradeDataSource</name>
+ <config-property-setting name="IfxHost">localhost</config-property-setting>
+ <config-property-setting name="ServerName">ol_ids_1150_1</config-property-setting>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <config-property-setting name="PortNumber">1526</config-property-setting>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="IfxSQLHostType"/>
+ <config-property-setting name="IfxSQLHostFile"/>
+ <config-property-setting name="IfxProtocolTrace"/>
+ <config-property-setting name="IfxProtocolTraceFile"/>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>100</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ <connectiondefinition-instance>
+ <name>jdbc/NoTxTradeDataSource</name>
+ <config-property-setting name="IfxHost">localhost</config-property-setting>
+ <config-property-setting name="ServerName">ol_ids_1150_1</config-property-setting>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <config-property-setting name="PortNumber">1526</config-property-setting>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="IfxSQLHostType"/>
+ <config-property-setting name="IfxSQLHostFile"/>
+ <config-property-setting name="IfxProtocolTrace"/>
+ <config-property-setting name="IfxProtocolTraceFile"/>
+ <connectionmanager>
+ <no-transaction/>
+ <single-pool>
+ <max-size>10</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+</connector>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/pom.xml Fri Jun 25 06:33:41 2010
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
+ <artifactId>connector-deployer-1_6</artifactId>
<type>car</type>
<version>${geronimoVersion}</version>
<scope>provided</scope>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-mysql-datasource/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -1,67 +1,67 @@
-<?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$ $Date$ -->
-
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jdbc/TradeDataSource</name>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="PortNumber">3306</config-property-setting>
- <config-property-setting name="ServerName">localhost</config-property-setting>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>100</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- <connectiondefinition-instance>
- <name>jdbc/NoTxTradeDataSource</name>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="PortNumber">3306</config-property-setting>
- <config-property-setting name="ServerName">localhost</config-property-setting>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <connectionmanager>
- <no-transaction/>
- <single-pool>
- <max-size>10</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-</connector>
+<?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$ $Date$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jdbc/TradeDataSource</name>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="PortNumber">3306</config-property-setting>
+ <config-property-setting name="ServerName">localhost</config-property-setting>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <connectionmanager>
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>100</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ <connectiondefinition-instance>
+ <name>jdbc/NoTxTradeDataSource</name>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="PortNumber">3306</config-property-setting>
+ <config-property-setting name="ServerName">localhost</config-property-setting>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <connectionmanager>
+ <no-transaction/>
+ <single-pool>
+ <max-size>10</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+</connector>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-oracle-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-oracle-datasource/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-oracle-datasource/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-oracle-datasource/pom.xml Fri Jun 25 06:33:41 2010
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
+ <artifactId>connector-deployer-1_6</artifactId>
<type>car</type>
<version>${geronimoVersion}</version>
<scope>provided</scope>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/pom.xml Fri Jun 25 06:33:41 2010
@@ -86,7 +86,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer</artifactId>
+ <artifactId>connector-deployer-1_6</artifactId>
<type>car</type>
<version>${geronimoVersion}</version>
<scope>provided</scope>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-postgre-datasource/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -1,67 +1,67 @@
-<?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$ $Date$ -->
-
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jdbc/TradeDataSource</name>
- <config-property-setting name="PrepareThreshold"/>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="ServerName">localhost</config-property-setting>
- <config-property-setting name="PortNumber">5432</config-property-setting>
- <connectionmanager>
- <local-transaction/>
- <single-pool>
- <max-size>100</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>1</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- <connectiondefinition-instance>
- <name>jdbc/NoTxTradeDataSource</name>
- <config-property-setting name="PrepareThreshold"/>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="ServerName">localhost</config-property-setting>
- <config-property-setting name="PortNumber">5432</config-property-setting>
- <connectionmanager>
- <no-transaction/>
- <single-pool>
- <max-size>100</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>1</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-</connector>
+<?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$ $Date$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jdbc/TradeDataSource</name>
+ <config-property-setting name="PrepareThreshold"/>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="ServerName">localhost</config-property-setting>
+ <config-property-setting name="PortNumber">5432</config-property-setting>
+ <connectionmanager>
+ <local-transaction/>
+ <single-pool>
+ <max-size>100</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>1</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ <connectiondefinition-instance>
+ <name>jdbc/NoTxTradeDataSource</name>
+ <config-property-setting name="PrepareThreshold"/>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="ServerName">localhost</config-property-setting>
+ <config-property-setting name="PortNumber">5432</config-property-setting>
+ <connectionmanager>
+ <no-transaction/>
+ <single-pool>
+ <max-size>100</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>1</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+</connector>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,23 +1,23 @@
-<?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$ $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">
+<?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$ $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>
@@ -26,107 +26,107 @@
<version>3.0-M1-SNAPSHOT</version>
</parent>
- <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
- <artifactId>daytrader-sqlserver-datasource</artifactId>
- <packaging>car</packaging>
- <name>Daytrader :: Plugins :: Microsoft SQL Server DataSource</name>
- <description>Microsoft SQL Server Datasource plugin for Daytrader. Requires SQL Server 2.0 JDBC files.</description>
-
- <!--
- You can build this datasource if you have:
- 1) the MSSQL artifact installed in a local repo and supply the URL:
- -Dmaven.repo.drivers=http://my.local.repo
- 2) a copy of the MSSQL JDBC driver and run the following command:
- mvn install:install-file -Dfile=${path to sqljdbc4.jar}\
- -DgroupId=com.microsoft.sqlserver \
- -DartifactId=sqljdbc4 \
- -Dversion=2.0 \
- -Dpackaging=jar
- -->
- <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>
-
- <dependencies>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <type>rar</type>
- <version>1.1</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</artifactId>
- <type>car</type>
- <version>${geronimoVersion}</version>
- <scope>provided</scope>
- </dependency>
- <!--You need to install the jdbc driver into local maven repo by self-->
- <dependency>
- <groupId>com.microsoft.sqlserver</groupId>
- <artifactId>sqljdbc4</artifactId>
- <version>2.0</version>
- <type>jar</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <module>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <type>rar</type>
- </module>
- <instance>
- <plugin-artifact>
- <obsoletes>
- <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
- <artifactId>daytrader-derby-datasource</artifactId>
- </obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car</artifact-alias>
- <obsoletes>
- <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
- <artifactId>daytrader-sqlserver-datasource</artifactId>
- </obsoletes>
- </plugin-artifact>
- </instance>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-sqlserver-datasource</artifactId>
+ <packaging>car</packaging>
+ <name>Daytrader :: Plugins :: Microsoft SQL Server DataSource</name>
+ <description>Microsoft SQL Server Datasource plugin for Daytrader. Requires SQL Server 2.0 JDBC files.</description>
+
+ <!--
+ You can build this datasource if you have:
+ 1) the MSSQL artifact installed in a local repo and supply the URL:
+ -Dmaven.repo.drivers=http://my.local.repo
+ 2) a copy of the MSSQL JDBC driver and run the following command:
+ mvn install:install-file -Dfile=${path to sqljdbc4.jar}\
+ -DgroupId=com.microsoft.sqlserver \
+ -DartifactId=sqljdbc4 \
+ -Dversion=2.0 \
+ -Dpackaging=jar
+ -->
+ <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>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
+ <type>rar</type>
+ <version>1.1</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>
+ <!--You need to install the jdbc driver into local maven repo by self-->
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>sqljdbc4</artifactId>
+ <version>2.0</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <module>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
+ <type>rar</type>
+ </module>
+ <instance>
+ <plugin-artifact>
+ <obsoletes>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-derby-datasource</artifactId>
+ </obsoletes>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-derby-datasource/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-sqlserver-datasource/${pom.version}/car</artifact-alias>
+ <obsoletes>
+ <groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
+ <artifactId>daytrader-sqlserver-datasource</artifactId>
+ </obsoletes>
+ </plugin-artifact>
+ </instance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-sqlserver-datasource/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -1,68 +1,68 @@
-<?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$ $Date$ -->
-
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
- <resourceadapter>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>jdbc/TradeDataSource</name>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="PortNumber">1433</config-property-setting>
- <config-property-setting name="ServerName">localhost</config-property-setting>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <connectionmanager>
- <!-- By default, SQL Server does not enable XA feature, you need to enable it before running daytrader -->
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>100</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- <connectiondefinition-instance>
- <name>jdbc/NoTxTradeDataSource</name>
- <config-property-setting name="UserName">trade</config-property-setting>
- <config-property-setting name="Password">trade</config-property-setting>
- <config-property-setting name="PortNumber">1433</config-property-setting>
- <config-property-setting name="ServerName">localhost</config-property-setting>
- <config-property-setting name="DatabaseName">tradedb</config-property-setting>
- <connectionmanager>
- <no-transaction/>
- <single-pool>
- <max-size>10</max-size>
- <min-size>0</min-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <idle-timeout-minutes>30</idle-timeout-minutes>
- <match-one/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
-</connector>
+<?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$ $Date$ -->
+
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <resourceadapter>
+ <outbound-resourceadapter>
+ <connection-definition>
+ <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+ <connectiondefinition-instance>
+ <name>jdbc/TradeDataSource</name>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="PortNumber">1433</config-property-setting>
+ <config-property-setting name="ServerName">localhost</config-property-setting>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <connectionmanager>
+ <!-- By default, SQL Server does not enable XA feature, you need to enable it before running daytrader -->
+ <xa-transaction>
+ <transaction-caching/>
+ </xa-transaction>
+ <single-pool>
+ <max-size>100</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ <connectiondefinition-instance>
+ <name>jdbc/NoTxTradeDataSource</name>
+ <config-property-setting name="UserName">trade</config-property-setting>
+ <config-property-setting name="Password">trade</config-property-setting>
+ <config-property-setting name="PortNumber">1433</config-property-setting>
+ <config-property-setting name="ServerName">localhost</config-property-setting>
+ <config-property-setting name="DatabaseName">tradedb</config-property-setting>
+ <connectionmanager>
+ <no-transaction/>
+ <single-pool>
+ <max-size>10</max-size>
+ <min-size>0</min-size>
+ <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+ <idle-timeout-minutes>30</idle-timeout-minutes>
+ <match-one/>
+ </single-pool>
+ </connectionmanager>
+ </connectiondefinition-instance>
+ </connection-definition>
+ </outbound-resourceadapter>
+ </resourceadapter>
+</connector>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -31,6 +31,7 @@
<packaging>car</packaging>
<name>Daytrader :: Plugins :: Web + Direct JDBC :: Jetty</name>
+ <description>Daytrader :: Plugins :: Web + Direct JDBC :: Jetty</description>
<dependencies>
<dependency>
@@ -49,7 +50,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty7-deployer</artifactId>
+ <artifactId>${jetty}-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -66,7 +67,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty7</artifactId>
+ <artifactId>${jetty}</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -90,7 +91,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${jetty7Deployer}</deploymentConfig>
+ <deploymentConfig>${jettyDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
@@ -104,17 +105,17 @@
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
- <obsoletes>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${project.version}/car</artifact-alias>
+ <!--<obsoletes>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${project.version}/car</artifact-alias>
<obsoletes>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-jetty/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-jetty/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${project.version}/car</artifact-alias>-->
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -16,14 +16,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-
-
- <context-root>/daytrader</context-root>
+
+ <context-root>${project.artifactId}</context-root>
<naming:resource-ref>
<naming:ref-name>jdbc/TradeDataSource</naming:ref-name>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -35,20 +35,19 @@
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jdbc</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>war</type>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>${tomcat}-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -64,7 +63,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>${tomcat}</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -93,6 +92,7 @@
<module>
<groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jdbc</artifactId>
+ <version>${project.version}</version>
<type>war</type>
</module>
<instance>
@@ -101,17 +101,17 @@
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
- <obsoletes>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${project.version}/car</artifact-alias>
+ <!--<obsoletes>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${project.version}/car</artifact-alias>
<obsoletes>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${project.version}/car</artifact-alias>-->
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jdbc-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -16,14 +16,21 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-
-
- <context-root>/daytrader</context-root>
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <sys:environment>
+ <sys:dependencies>
+ <sys:dependency>
+ <sys:groupId>org.apache.geronimo.samples.daytrader.plugins</sys:groupId>
+ <sys:artifactId>daytrader-derby-datasource</sys:artifactId>
+ <sys:version>${project.version}</sys:version>
+ <sys:type>car</sys:type>
+ </sys:dependency>
+ </sys:dependencies>
+ </sys:environment>
+
+ <context-root>${project.artifactId}</context-root>
<naming:resource-ref>
<naming:ref-name>jdbc/TradeDataSource</naming:ref-name>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -29,7 +29,7 @@
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-jetty</artifactId>
<packaging>car</packaging>
- <name>Daytrader :: Plugins :: Web + JPA :: Jetty</name>
+ <name>Daytrader :: Plugins :: Web + Direct JPA :: Jetty</name>
<dependencies>
@@ -43,13 +43,13 @@
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-derby-datasource</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>car</type>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty7-deployer</artifactId>
+ <artifactId>${jetty}-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -66,7 +66,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty7</artifactId>
+ <artifactId>${jetty}</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -90,7 +90,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${jetty7Deployer}</deploymentConfig>
+ <deploymentConfig>${jettyDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
@@ -104,17 +104,17 @@
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
- <obsoletes>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${project.version}/car</artifact-alias>
+ <!--<obsoletes>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-jetty/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${project.version}/car</artifact-alias>
<obsoletes>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-jetty</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-jetty/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-jetty/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-jetty/${project.version}/car</artifact-alias>-->
</plugin-artifact>
</instance>
</configuration>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -16,14 +16,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-
- <context-root>/daytrader</context-root>
+ <context-root>${project.artifactId}</context-root>
<naming:resource-ref>
<naming:ref-name>jdbc/TradeDataSource</naming:ref-name>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.geronimo.samples.daytrader.assemblies.web</groupId>
<artifactId>daytrader-web-jpa</artifactId>
- <version>${version}</version>
+ <version>${project.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
@@ -48,7 +48,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
+ <artifactId>${tomcat}-deployer</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
<scope>provided</scope>
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6</artifactId>
+ <artifactId>${tomcat}</artifactId>
<version>${geronimoVersion}</version>
<type>car</type>
</dependency>
@@ -101,25 +101,24 @@
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jpa-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
- <obsoletes>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat//car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${project.version}/car</artifact-alias>
+ <!--<obsoletes>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-web-jdbc-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jdbc-tomcat/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${project.version}/car</artifact-alias>
<obsoletes>
<groupId>org.apache.geronimo.samples.daytrader.plugins</groupId>
<artifactId>daytrader-tomcat</artifactId>
</obsoletes>
- <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${pom.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${pom.version}/car</artifact-alias>
+ <artifact-alias key="org.apache.geronimo.samples.daytrader.plugins/daytrader-tomcat/${project.version}/car">org.apache.geronimo.samples.daytrader.plugins/daytrader-web-jpa-tomcat/${project.version}/car</artifact-alias>-->
</plugin-artifact>
</instance>
</configuration>
- </plugin>
-
-
+ </plugin>
</plugins>
</build>
+
<profiles>
<profile>
<id>it</id>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/daytrader-web-jpa-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -16,14 +16,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-
- <context-root>/daytrader</context-root>
+ <context-root>${project.artifactId}</context-root>
<naming:resource-ref>
<naming:ref-name>jdbc/TradeDataSource</naming:ref-name>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/plugins/pom.xml Fri Jun 25 06:33:41 2010
@@ -45,9 +45,9 @@
<module>daytrader-web-jdbc-tomcat</module>
<module>daytrader-web-jpa-jetty</module>
<module>daytrader-web-jpa-tomcat</module>
- <module>daytrader-jms</module>
+ <!--<module>daytrader-jms</module>
<module>daytrader-jetty</module>
- <module>daytrader-tomcat</module>
+ <module>daytrader-tomcat</module>-->
</modules>
</profile>
<!--
@@ -58,7 +58,7 @@
-Dmaven.repo.drivers=http://my.local.repo
-->
<profile>
- <id>all</id>
+ <id>all-subprojects</id>
<activation>
<property>
<name>all</name>
@@ -66,19 +66,19 @@
</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-web-jdbc-jetty</module>
+ <module>daytrader-web-jdbc-jetty</module>
<module>daytrader-web-jdbc-tomcat</module>
<module>daytrader-web-jpa-jetty</module>
<module>daytrader-web-jpa-tomcat</module>
<module>daytrader-jms</module>
<module>daytrader-jetty</module>
<module>daytrader-tomcat</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>
</modules>
<properties>
<maven.repo.drivers>http://not.a.real.repository</maven.repo.drivers>
@@ -100,47 +100,5 @@
</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>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>
-
- </plugins>
- </build>
+
</project>
Modified: geronimo/samples/branches/3.0-M1/samples/daytrader/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/daytrader/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/daytrader/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/daytrader/pom.xml Fri Jun 25 06:33:41 2010
@@ -41,28 +41,11 @@
<properties>
<!-- This property is required by the car:package mojo, inherited from samples' root pom -->
<!--Crack: Use 2.2 to test if plugins is compilable and workable -->
- <geronimoVersion>2.2</geronimoVersion>
+ <!--<geronimoVersion>2.2</geronimoVersion>-->
<!-- set siteId to artifactId for any "top level" project rooting a website -->
<siteId>daytrader</siteId>
-
- <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
- <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
- <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
- <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
- <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
- <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
- <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
- <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
- <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
- <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
- <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
- <jetty7Deployer>org.apache.geronimo.configs/jetty7-deployer/${geronimoVersion}/car</jetty7Deployer>
- <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
- <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
-
- <openjpaVersion>1.2.2</openjpaVersion>
- <geronimoJavaEE5Version>2.2</geronimoJavaEE5Version>
+ <openjpaVersion>2.0.0</openjpaVersion>
</properties>
<issueManagement>
@@ -149,15 +132,7 @@
<dependencyManagement>
- <dependencies>
- <!-- Import Geronimo Server used dependency versions -->
- <dependency>
- <groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo</artifactId>
- <version>${geronimoJavaEE5Version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
+ <dependencies>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -263,6 +238,15 @@
<!-- Installable assemblies -->
<module>assemblies</module>
</modules>
+ </profile>
+ <profile>
+ <id>all-subprojects</id>
+
+ <modules>
+ <module>modules</module>
+ <module>assemblies</module>
+ <module>plugins</module>
+ </modules>
</profile>
<profile>