geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r957816 [9/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/...
Date Fri, 25 Jun 2010 06:33:49 GMT
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp Fri Jun 25 06:33:41 2010
@@ -1,82 +1,82 @@
-<%--
-    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.
---%>
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-
-
-<html:xhtml/>
-<html>
-<head></head>
-<body>
-<h2 align="center"><bean:message key="register.title"/></h2>
-<html:errors/>
-
-<html:form action="/register" focus="username"
-           onsubmit="return validateOwnerForm(this);">
-    <table border="0" width="100%">
-
-        <tr>
-            <th align="right">
-                <bean:message key="prompt.username"/>:
-            </th>
-            <td align="left">
-                <html:text property="username" size="16" maxlength="18"/>
-            </td>
-        </tr>
-
-        <tr>
-            <th align="right">
-                <bean:message key="prompt.password"/>:
-            </th>
-            <td align="left">
-                <html:password property="password" size="16" maxlength="18"
-                               redisplay="false"/>
-            </td>
-        </tr>
-        
-        <tr>
-            <th align="right">
-                <bean:message key="prompt.password2"/>:
-            </th>
-            <td align="left">
-                <html:password property="password2" size="16" maxlength="16"/>
-            </td>
-        </tr>
-
-        <tr>
-            <td align="right">
-                <html:submit property="DO_SUBMIT">
-                    <bean:message key="button.submit"/>
-                </html:submit>
-            </td>
-            <td align="left">
-                <html:reset property="DO_RESET">
-                    <bean:message key="button.reset"/>
-                </html:reset>
-            </td>
-        </tr>
-
-    </table>
-
-</html:form>
-
-<html:javascript formName="OwnerForm"/>
-
-</body>
-</html>
+<%--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+         http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+--%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+
+
+<html:xhtml/>
+<html>
+<head></head>
+<body>
+<h2 align="center"><bean:message key="register.title"/></h2>
+<html:errors/>
+
+<html:form action="/register" focus="username"
+           onsubmit="return validateOwnerForm(this);">
+    <table border="0" width="100%">
+
+        <tr>
+            <th align="right">
+                <bean:message key="prompt.username"/>:
+            </th>
+            <td align="left">
+                <html:text property="username" size="16" maxlength="18"/>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">
+                <bean:message key="prompt.password"/>:
+            </th>
+            <td align="left">
+                <html:password property="password" size="16" maxlength="18"
+                               redisplay="false"/>
+            </td>
+        </tr>
+        
+        <tr>
+            <th align="right">
+                <bean:message key="prompt.password2"/>:
+            </th>
+            <td align="left">
+                <html:password property="password2" size="16" maxlength="16"/>
+            </td>
+        </tr>
+
+        <tr>
+            <td align="right">
+                <html:submit property="DO_SUBMIT">
+                    <bean:message key="button.submit"/>
+                </html:submit>
+            </td>
+            <td align="left">
+                <html:reset property="DO_RESET">
+                    <bean:message key="button.reset"/>
+                </html:reset>
+            </td>
+        </tr>
+
+    </table>
+
+</html:form>
+
+<html:javascript formName="OwnerForm"/>
+
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp Fri Jun 25 06:33:41 2010
@@ -1,93 +1,93 @@
-<!--
-		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.
--->
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html:xhtml/>
-<html>
-<head>
-<title>Remove CD</title>
-</head>
-<logic:notPresent name="owner">
-<logic:redirect href="Logon.do"></logic:redirect>
-</logic:notPresent>
-<body>
-
-<html:errors/>
-
-<html:form action="/removeCD">
-    <table border="0" width="80%" align="center">
-
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdlabel"/>:
-            </th>
-            <td align="left">
-                <html:hidden property="cdLabel" value='<%= request.getParameter("cdLabel")%>'/>
-                <%=request.getParameter("cdLabel") %>
-            </td>
-        </tr>
-
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cddescription"/>:
-            </th>
-            <td align="left">
-                <html:hidden property="cdDescription" value='<%= request.getParameter("cdDescription")%>'/>
-                <%= request.getParameter("cdDescription")%>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdsize"/>:
-            </th>
-            <td align="left">
-                <html:hidden property="cdSize" value='<%= request.getParameter("cdSize")%>'/>
-                <%= request.getParameter("cdSize")%>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdarchivedate"/>:
-            </th>
-            <td align="left">
-                <html:hidden property="cdArchiveDate" value='<%= request.getParameter("cdArchiveDate")%>'/>
-                <%= request.getParameter("cdArchiveDate")%>
-            </td>
-        </tr>
-
-        <tr>
-            <td align="right">
-            	<html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
-                <html:submit property="DO_SUBMIT">
-                    <bean:message key="button.remove"/>
-                </html:submit>
-            </td>
-            <td align="left">
-                <html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
-            </td>
-        </tr>
-
-    </table>
-
-</html:form>
-
-<html:javascript formName="DataCDForm"/>
-
-</body>
-</html>
+<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+-->
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html:xhtml/>
+<html>
+<head>
+<title>Remove CD</title>
+</head>
+<logic:notPresent name="owner">
+<logic:redirect href="Logon.do"></logic:redirect>
+</logic:notPresent>
+<body>
+
+<html:errors/>
+
+<html:form action="/removeCD">
+    <table border="0" width="80%" align="center">
+
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdlabel"/>:
+            </th>
+            <td align="left">
+                <html:hidden property="cdLabel" value='<%= request.getParameter("cdLabel")%>'/>
+                <%=request.getParameter("cdLabel") %>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cddescription"/>:
+            </th>
+            <td align="left">
+                <html:hidden property="cdDescription" value='<%= request.getParameter("cdDescription")%>'/>
+                <%= request.getParameter("cdDescription")%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdsize"/>:
+            </th>
+            <td align="left">
+                <html:hidden property="cdSize" value='<%= request.getParameter("cdSize")%>'/>
+                <%= request.getParameter("cdSize")%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdarchivedate"/>:
+            </th>
+            <td align="left">
+                <html:hidden property="cdArchiveDate" value='<%= request.getParameter("cdArchiveDate")%>'/>
+                <%= request.getParameter("cdArchiveDate")%>
+            </td>
+        </tr>
+
+        <tr>
+            <td align="right">
+            	<html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
+                <html:submit property="DO_SUBMIT">
+                    <bean:message key="button.remove"/>
+                </html:submit>
+            </td>
+            <td align="left">
+                <html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
+            </td>
+        </tr>
+
+    </table>
+
+</html:form>
+
+<html:javascript formName="DataCDForm"/>
+
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp Fri Jun 25 06:33:41 2010
@@ -1,92 +1,92 @@
-<!--
-		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.
--->
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
-<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html:xhtml/>
-<html>
-<head>
-<title>View/Update CD Details</title>
-</head>
-<logic:notPresent name="owner">
-<logic:redirect href="Logon.do"></logic:redirect>
-</logic:notPresent>
-<body>
-
-<html:errors/>
-
-<html:form action="/updateCD" focus="cddesc"
-           onsubmit="return validateDataCDForm(this);">
-    <table border="0" width="80%" align="center">
-
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdlabel"/>:
-            </th>
-            <td align="left">
-                <html:text property="cdLabel" size="16" maxlength="20" readonly="true" value='<%= request.getParameter("cdLabel")%>'/>
-            </td>
-        </tr>
-
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cddescription"/>:
-            </th>
-            <td align="left">
-                <html:textarea property="cdDescription" rows="10" cols="30" value='<%= request.getParameter("cdDescription")%>'/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdsize"/>:
-            </th>
-            <td align="left">
-                <html:text property="cdSize" size="10" maxlength="10" value='<%= request.getParameter("cdSize")%>'/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdarchivedate"/>:
-            </th>
-            <td align="left">
-                <html:text property="cdArchiveDate" size="16" maxlength="20" value='<%= request.getParameter("cdArchiveDate")%>'/>&nbsp;(yyyy-MM-dd)
-            </td>
-        </tr>
-
-        <tr>
-            <td align="right">
-            	<html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
-                <html:submit property="DO_SUBMIT">
-                    <bean:message key="button.update"/>
-                </html:submit>
-            </td>
-            <td align="left">
-                <html:reset property="DO_RESET">
-                    <bean:message key="button.reset"/>
-                </html:reset> &nbsp;<html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
-            </td>
-        </tr>
-
-    </table>
-
-</html:form>
-
-<html:javascript formName="DataCDForm"/>
-
-</body>
-</html>
+<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+-->
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html:xhtml/>
+<html>
+<head>
+<title>View/Update CD Details</title>
+</head>
+<logic:notPresent name="owner">
+<logic:redirect href="Logon.do"></logic:redirect>
+</logic:notPresent>
+<body>
+
+<html:errors/>
+
+<html:form action="/updateCD" focus="cddesc"
+           onsubmit="return validateDataCDForm(this);">
+    <table border="0" width="80%" align="center">
+
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdlabel"/>:
+            </th>
+            <td align="left">
+                <html:text property="cdLabel" size="16" maxlength="20" readonly="true" value='<%= request.getParameter("cdLabel")%>'/>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cddescription"/>:
+            </th>
+            <td align="left">
+                <html:textarea property="cdDescription" rows="10" cols="30" value='<%= request.getParameter("cdDescription")%>'/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdsize"/>:
+            </th>
+            <td align="left">
+                <html:text property="cdSize" size="10" maxlength="10" value='<%= request.getParameter("cdSize")%>'/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdarchivedate"/>:
+            </th>
+            <td align="left">
+                <html:text property="cdArchiveDate" size="16" maxlength="20" value='<%= request.getParameter("cdArchiveDate")%>'/>&nbsp;(yyyy-MM-dd)
+            </td>
+        </tr>
+
+        <tr>
+            <td align="right">
+            	<html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
+                <html:submit property="DO_SUBMIT">
+                    <bean:message key="button.update"/>
+                </html:submit>
+            </td>
+            <td align="left">
+                <html:reset property="DO_RESET">
+                    <bean:message key="button.reset"/>
+                </html:reset> &nbsp;<html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
+            </td>
+        </tr>
+
+    </table>
+
+</html:form>
+
+<html:javascript formName="DataCDForm"/>
+
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,55 +1,55 @@
-<?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>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>javaee5</artifactId>
-        <version>3.0-M1-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>DataCDInfo</artifactId>
-    <name>Geronimo Samples :: DataCDInfo</name>
-    <packaging>pom</packaging>
-    
-    <description>
-        Geronimo DataCDInfo sample created from an archetype.
-    </description>
-    
-   
-
-   <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                  <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
+<?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>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>javaee5</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>DataCDInfo</artifactId>
+    <name>Geronimo Samples :: DataCDInfo</name>
+    <packaging>pom</packaging>
+    
+    <description>
+        Geronimo DataCDInfo sample created from an archetype.
+    </description>
+    
+   
+
+   <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
@@ -58,12 +58,12 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <modules>
-                <module>DataCDInfo-JTA-ejb</module>                
-                <module>DataCDInfo-JTA-war</module>        
-    	        <module>DataCDInfo-JTA-ear</module>
-                <module>DataCDInfo-JTA-jetty</module>
-                <module>DataCDInfo-JTA-tomcat</module>
+            <modules>
+                <module>DataCDInfo-JTA-ejb</module>                
+                <module>DataCDInfo-JTA-war</module>        
+    	        <module>DataCDInfo-JTA-ear</module>
+                <module>DataCDInfo-JTA-jetty</module>
+                <module>DataCDInfo-JTA-tomcat</module>
             </modules>
         </profile>
         <profile>
@@ -76,10 +76,10 @@
                 </property>        
             </activation>
             <modules>
-                <module>DataCDInfo-JTA-ejb</module>                
-                <module>DataCDInfo-JTA-war</module>        
+                <module>DataCDInfo-JTA-ejb</module>                
+                <module>DataCDInfo-JTA-war</module>        
     	        <module>DataCDInfo-JTA-ear</module>
             </modules>
         </profile>
-    </profiles>
-</project>
+    </profiles>
+</project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/readme.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/readme.txt?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/readme.txt (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/readme.txt Fri Jun 25 06:33:41 2010
@@ -1,49 +1,49 @@
-# 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.
-
-Apache Geronimo Samples
-----------------------------------------------------------------------
-
-This sample demonstrates Struts1, EJB 3.0 Session Bean, JPA, JTA and Security Annotations technologies.
-
-This README uses the following aliases to describe directories.  These aliases should be replaced with your actual directory paths.
-   %SAMPLE_HOME% refers to the root directory where Geronimo samples are extracted.
-   %GERONIMO_HOME% refers to the root directory where the Geronimo server is installed.
-   
-
-BUILD
------
-1. cd %SAMPLE_HOME%/samples/DataCDInfo
-2. maven clean install
-
-
-INSTALL
--------
-1. Start the Geronimo server if it is not already running.
-2. %GERONIMO_HOME%/bin/deploy.[bat|sh] deploy %SAMPLE_HOME%/samples/DataCDInfo/DataCDInfo-JTA-ear/DataCDInfo-JTA-ear-<version>.ear
-   
-
-RUN
----
-1. Open the following link in a web browser:
-        http://localhost:8080/DataCDInfo/
-
-
-MEMO
-----
-To demonstrate security annotation usage, some exceptions are expected: if you are not in "superadmin" role to enter administration
-page, you will experience "javax.ejb.EJBAccessException: Unauthorized Access by Principal Denied".
+# 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.
+
+Apache Geronimo Samples
+----------------------------------------------------------------------
+
+This sample demonstrates Struts1, EJB 3.0 Session Bean, JPA, JTA and Security Annotations technologies.
+
+This README uses the following aliases to describe directories.  These aliases should be replaced with your actual directory paths.
+   %SAMPLE_HOME% refers to the root directory where Geronimo samples are extracted.
+   %GERONIMO_HOME% refers to the root directory where the Geronimo server is installed.
+   
+
+BUILD
+-----
+1. cd %SAMPLE_HOME%/samples/DataCDInfo
+2. maven clean install
+
+
+INSTALL
+-------
+1. Start the Geronimo server if it is not already running.
+2. %GERONIMO_HOME%/bin/deploy.[bat|sh] deploy %SAMPLE_HOME%/samples/DataCDInfo/DataCDInfo-JTA-ear/DataCDInfo-JTA-ear-<version>.ear
+   
+
+RUN
+---
+1. Open the following link in a web browser:
+        http://localhost:8080/DataCDInfo/
+
+
+MEMO
+----
+To demonstrate security annotation usage, some exceptions are expected: if you are not in "superadmin" role to enter administration
+page, you will experience "javax.ejb.EJBAccessException: Unauthorized Access by Principal Denied".

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -83,16 +83,9 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
-    <properties>
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-    </properties>
-
+    
     <build>
         <plugins>
             <plugin>
@@ -117,7 +110,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -40,7 +40,7 @@
     <module>
         <web>connectors.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
-            <gbean name="JettyWebConnector1" class="org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector">
+            <gbean name="JettyWebConnector1" class="org.apache.geronimo.jetty8.connector.HTTPSelectChannelConnector">
                 <attribute name="host">localhost</attribute>
                 <attribute name="port">8090</attribute>
                 <attribute name="headerBufferSizeBytes">8192</attribute>
@@ -53,7 +53,7 @@
                 <attribute name="maxThreads">50</attribute>
             </gbean>
 
-            <gbean name="JettyWebConnector2" class="org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector">
+            <gbean name="JettyWebConnector2" class="org.apache.geronimo.jetty8.connector.HTTPSelectChannelConnector">
                 <attribute name="host">localhost</attribute>
                 <attribute name="port">8091</attribute>
                 <attribute name="headerBufferSizeBytes">8192</attribute>
@@ -70,7 +70,7 @@
     </module>
 
 
-    <gbean name="JettyWebContainer1" class="org.apache.geronimo.jetty7.JettyContainerImpl">
+    <gbean name="JettyWebContainer1" class="org.apache.geronimo.jetty8.JettyContainerImpl">
         <attribute name="jettyHome">var/jetty1</attribute>
         <!--<reference name="WebManager">-->
             <!--<name>JettyWebManager</name>-->
@@ -80,7 +80,7 @@
         </reference>
     </gbean>
 
-    <gbean name="JettyRequestLog1" class="org.apache.geronimo.jetty7.requestlog.NCSARequestLog">
+    <gbean name="JettyRequestLog1" class="org.apache.geronimo.jetty8.requestlog.NCSARequestLog">
         <reference name="JettyContainer">
             <name>JettyWebContainer1</name>
         </reference>
@@ -92,7 +92,7 @@
         <attribute name="logTimeZone">GMT</attribute>
     </gbean>
 
-    <gbean name="JettyWebContainer2" class="org.apache.geronimo.jetty7.JettyContainerImpl">
+    <gbean name="JettyWebContainer2" class="org.apache.geronimo.jetty8.JettyContainerImpl">
         <attribute name="jettyHome">var/jetty2</attribute>
         <!--<reference name="WebManager">-->
             <!--<name>JettyWebManager</name>-->
@@ -102,7 +102,7 @@
         </reference>
     </gbean>
 
-    <gbean name="JettyRequestLog2" class="org.apache.geronimo.jetty7.requestlog.NCSARequestLog">
+    <gbean name="JettyRequestLog2" class="org.apache.geronimo.jetty8.requestlog.NCSARequestLog">
         <reference name="JettyContainer">
             <name>JettyWebContainer2</name>
         </reference>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -56,7 +56,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>
@@ -79,20 +79,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
-    <properties>
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-    </properties>
-
+    
     <build>
         <plugins>
             <plugin>
@@ -117,7 +110,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -83,15 +83,7 @@
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
-
-    </dependencies>
-
-    <properties>
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-    </properties>
+    </dependencies>   
 
     <build>
         <plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/app-per-port-war1-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -24,7 +24,7 @@
         <gbean-link>JettyWebContainer</gbean-link>
     </web-container>
 
-    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty7.connector.HTTPSelectChannelConnector">
+    <gbean name="JettyWebConnector" class="org.apache.geronimo.jetty8.connector.HTTPSelectChannelConnector">
         <attribute name="host">localhost</attribute>
         <attribute name="port">8090</attribute>
         <attribute name="headerBufferSizeBytes">8192</attribute>
@@ -37,7 +37,7 @@
         <attribute name="maxThreads">50</attribute>
     </gbean>
 
-    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty7.JettyContainerImpl">
+    <gbean name="JettyWebContainer" class="org.apache.geronimo.jetty8.JettyContainerImpl">
         <attribute name="jettyHome">var/jetty1</attribute>
         <!--<reference name="WebManager">-->
             <!--<name>JettyWebManager</name>-->
@@ -47,7 +47,7 @@
         </reference>
     </gbean>
 
-    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty7.requestlog.NCSARequestLog">
+    <gbean name="JettyRequestLog" class="org.apache.geronimo.jetty8.requestlog.NCSARequestLog">
         <reference name="JettyContainer">
             <name>JettyWebContainer</name>
         </reference>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/app-per-port/pom.xml Fri Jun 25 06:33:41 2010
@@ -70,5 +70,18 @@
                 <module>app-per-port-ear</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>app-per-port-war1</module>
+                <module>app-per-port-war2</module>
+                <module>app-per-port-connector-war</module>
+                <module>app-per-port-ear</module>
+                <module>app-per-port-war1-jetty</module>
+                <module>app-per-port-jetty</module>
+                <module>app-per-port-tomcat</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-client/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-client/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-client/pom.xml Fri Jun 25 06:33:41 2010
@@ -38,8 +38,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.openejb</groupId>
+            <groupId>org.apache.geronimo.ext.openejb</groupId>
             <artifactId>openejb-client</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -50,7 +51,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
         </dependency>
     </dependencies>
 

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-ejb/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-ejb/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-ejb/pom.xml Fri Jun 25 06:33:41 2010
@@ -39,13 +39,13 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -79,7 +79,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -108,7 +108,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -145,7 +145,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -21,11 +21,11 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
-        <attribute name="testSQL">select * from customer</attribute>
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+        <!--<attribute name="testSQL">select * from customer</attribute>-->
         <attribute name="path">BankDB.sql</attribute>
         <reference name="DataSource">
-            <name>SampleTxDatasource</name>
+            <name>SampleNoTxDatasource</name>
         </reference>
     </gbean>
 

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -54,7 +54,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>
@@ -78,7 +78,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -86,7 +86,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -107,7 +107,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -144,7 +144,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -21,11 +21,11 @@
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-    <gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
-        <attribute name="testSQL">select * from customer</attribute>
+    <gbean name="DBInitialization" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
+        <!--<attribute name="testSQL">select * from customer</attribute>-->
         <attribute name="path">BankDB.sql</attribute>
         <reference name="DataSource">
-            <name>SampleTxDatasource</name>
+            <name>SampleNoTxDatasource</name>
         </reference>
     </gbean>
 

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-war/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-war/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/bank/bank-war/pom.xml Fri Jun 25 06:33:41 2010
@@ -46,19 +46,19 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/bank/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/bank/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/bank/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/bank/pom.xml Fri Jun 25 06:33:41 2010
@@ -69,5 +69,17 @@
                 <module>bank-client</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>bank-ejb</module>
+                <module>bank-war</module>
+                <module>bank-ear</module>
+                <module>bank-jetty</module>
+                <module>bank-tomcat</module>
+                <module>bank-client</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -71,7 +71,7 @@
         </dependency>
                                                                                                                                                                                                                                                  <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -100,7 +100,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -137,7 +137,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/calculator-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -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>
@@ -72,14 +72,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6</artifactId>
+            <artifactId>${tomcat}</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -98,7 +98,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openjpa</artifactId>
+            <artifactId>openjpa2</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
@@ -135,7 +135,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/calculator/pom.xml Fri Jun 25 06:33:41 2010
@@ -63,5 +63,16 @@
                 <module>calculator-ear</module>
             </modules>
         </profile>
+        <profile>
+            <id>all-subprojects</id>
+            
+            <modules>
+                <module>calculator-ejb</module>
+                <module>calculator-war</module>
+                <module>calculator-ear</module>
+                <module>calculator-jetty</module>
+                <module>calculator-tomcat</module>
+            </modules>
+        </profile>
     </profiles>
 </project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,110 +1,110 @@
-<?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.samples</groupId>
-        <artifactId>csa-activemq</artifactId>
-        <version>3.0-M1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.samples</groupId>
-    <artifactId>csa-activemq-jetty</artifactId>
-    <name>Custom Server Assembly Sample :: ActiveMQ for Jetty</name>
-    <packaging>server-assembly</packaging>
-    
-    <description>
-        A Sample to demo how to use car-maven-plugin to assemble a server with ActiveMQ
-    </description>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework.plugingroups</groupId>
-            <artifactId>framework</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-	<dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>activemq-console-jetty</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-	<dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-	<dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>activemq-webconsole-jetty</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <servers>
-                        <serverInstance>
-                            <name>default</name>
-                            <configFile>var/config/config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>client</name>
-                            <attributeManagerFrom>default</attributeManagerFrom>
-                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>offline</name>
-                            <configFile>var/config/offline-deployer-config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>jsr88</name>
-                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                    </servers>
-                </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.samples</groupId>
+        <artifactId>csa-activemq</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>csa-activemq-jetty</artifactId>
+    <name>Custom Server Assembly Sample :: ActiveMQ for Jetty</name>
+    <packaging>server-assembly</packaging>
+    
+    <description>
+        A Sample to demo how to use car-maven-plugin to assemble a server with ActiveMQ
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>activemq-console-jetty</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-ra</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>activemq-webconsole-jetty</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>client</name>
+                            <attributeManagerFrom>default</attributeManagerFrom>
+                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>offline</name>
+                            <configFile>var/config/offline-deployer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>jsr88</name>
+                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,110 +1,110 @@
-<?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.samples</groupId>
-        <artifactId>csa-activemq</artifactId>
-        <version>3.0-M1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.geronimo.samples</groupId>
-    <artifactId>csa-activemq-tomcat</artifactId>
-    <name>Custom Server Assembly Sample :: ActiveMQ for Tomcat</name>
-    <packaging>server-assembly</packaging>
-    
-    <description>
-        A Sample to demo how to use car-maven-plugin to assemble a server with ActiveMQ
-    </description>
-    
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.framework.plugingroups</groupId>
-            <artifactId>framework</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-	<dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>activemq-console-tomcat</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-	<dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-	<dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>activemq-webconsole-tomcat</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>car-maven-plugin</artifactId>
-                <configuration>
-                    <servers>
-                        <serverInstance>
-                            <name>default</name>
-                            <configFile>var/config/config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>client</name>
-                            <attributeManagerFrom>default</attributeManagerFrom>
-                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>offline</name>
-                            <configFile>var/config/offline-deployer-config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                        <serverInstance>
-                            <name>jsr88</name>
-                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
-                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
-                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
-                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
-                        </serverInstance>
-                    </servers>
-                </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.samples</groupId>
+        <artifactId>csa-activemq</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>csa-activemq-tomcat</artifactId>
+    <name>Custom Server Assembly Sample :: ActiveMQ for Tomcat</name>
+    <packaging>server-assembly</packaging>
+    
+    <description>
+        A Sample to demo how to use car-maven-plugin to assemble a server with ActiveMQ
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>activemq-console-tomcat</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-ra</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>activemq-webconsole-tomcat</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>client</name>
+                            <attributeManagerFrom>default</attributeManagerFrom>
+                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>offline</name>
+                            <configFile>var/config/offline-deployer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>jsr88</name>
+                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,47 +1,47 @@
-<?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>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>javaee5</artifactId>
-        <version>3.0-M1-SNAPSHOT</version>
-    </parent>
-    
-    <artifactId>csa-activemq</artifactId>
-    <name>Custom Server Assembly Sample :: ActiveMQ</name>
-    <packaging>pom</packaging>
-    <version>3.0-M1-SNAPSHOT</version>
-    
-    <description>
-        A Sample to demo how to use car-maven-plugin to assemble a server with ActiveMQ
-    </description>
-    
-   <modules>
-        <module>csa-activemq-jetty</module>        
-        <module>csa-activemq-tomcat</module>        
+<?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>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>javaee5</artifactId>
+        <version>3.0-M1-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>csa-activemq</artifactId>
+    <name>Custom Server Assembly Sample :: ActiveMQ</name>
+    <packaging>pom</packaging>
+    <version>3.0-M1-SNAPSHOT</version>
+    
+    <description>
+        A Sample to demo how to use car-maven-plugin to assemble a server with ActiveMQ
+    </description>
+    
+   <modules>
+        <module>csa-activemq-jetty</module>        
+        <module>csa-activemq-tomcat</module>        
    </modules>   
-    
-</project>
+    
+</project>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/readme.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/readme.txt?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/readme.txt (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/csa-activemq/readme.txt Fri Jun 25 06:33:41 2010
@@ -1,47 +1,47 @@
-# 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.
-
-Apache Geronimo Samples
-----------------------------------------------------------------------
-
-This sample demonstrates geronimo custom server assembly(CSA) technologies.
-
-This README uses the following aliases to describe directories.  These aliases should be replaced with your actual directory paths.
-   %SAMPLE_HOME% refers to the root directory where Geronimo samples are extracted.
-   %GERONIMO_HOME% refers to the root directory where the Geronimo server is installed.
-   
-
-BUILD
------
-1. cd %SAMPLE_HOME%/samples/csa-activemq
-2. maven clean install
-
-
-INSTALL
--------
-Unzip the packed server assembly.
-   
-
-RUN
----
-1. Start the custom server assembly
-2. Open browser at http://localhost:8080/console
-
-
-MEMO
-----
-This sample assembles an ActiveMQ server ready for use, also it includes a web console from ActiveMQ project.
+# 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.
+
+Apache Geronimo Samples
+----------------------------------------------------------------------
+
+This sample demonstrates geronimo custom server assembly(CSA) technologies.
+
+This README uses the following aliases to describe directories.  These aliases should be replaced with your actual directory paths.
+   %SAMPLE_HOME% refers to the root directory where Geronimo samples are extracted.
+   %GERONIMO_HOME% refers to the root directory where the Geronimo server is installed.
+   
+
+BUILD
+-----
+1. cd %SAMPLE_HOME%/samples/csa-activemq
+2. maven clean install
+
+
+INSTALL
+-------
+Unzip the packed server assembly.
+   
+
+RUN
+---
+1. Start the custom server assembly
+2. Open browser at http://localhost:8080/console
+
+
+MEMO
+----
+This sample assembles an ActiveMQ server ready for use, also it includes a web console from ActiveMQ project.



Mime
View raw message