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 [7/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/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,44 +1,44 @@
-<?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>DataCDInfo</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>DataCDInfo-JTA-war</artifactId>
- <name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: WAR</name>
- <packaging>war</packaging>
-
- <description>Geronimo Samples - DataCD Information Management Tool</description>
-
+<?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>DataCDInfo</artifactId>
+ <version>3.0-M1-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>DataCDInfo-JTA-war</artifactId>
+ <name>Geronimo Samples :: DataCDInfo JTA + Struts1 :: WAR</name>
+ <packaging>war</packaging>
+
+ <description>Geronimo Samples - DataCD Information Management Tool</description>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
<artifactId>DataCDInfo-JTA-ejb</artifactId>
<version>${version}</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
@@ -55,10 +55,10 @@
<artifactId>commons-chain</artifactId>
<version>1.1</version>
<exclusions>
- <exclusion>
- <groupId>myfaces</groupId>
- <artifactId>myfaces-api</artifactId>
- </exclusion>
+ <exclusion>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -87,8 +87,8 @@
<version>1.3.1</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>org.apache.geronimo.bundles</groupId>
+ <artifactId>jstl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -274,101 +274,86 @@
<version>1.3</version>
</dependency>-->
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <groupId>org.apache.portals</groupId>
+ <artifactId>portlet-api_2.0_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-annotation_1.1_spec</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <artifactId>geronimo-jpa_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>provided</scope>
</dependency>
+ </dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <id>copy-parent-site</id>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <echo>Copying site directory from parent</echo>
+ <copy todir="${project.build.directory}/${pom.artifactId}-2.2"
+ failonerror="false" overwrite="true">
+ <fileset dir="${pom.basedir}/../docs" />
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>process-resources</phase>
- <id>copy-parent-site</id>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <echo>Copying site directory from parent</echo>
- <copy todir="${project.build.directory}/${pom.artifactId}-2.2"
- failonerror="false" overwrite="true">
- <fileset dir="${pom.basedir}/../docs" />
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archiveClasses>false</archiveClasses>
- <webResources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <!-- override the destination directory for this resource -->
- <targetPath>WEB-INF/classes</targetPath>
- <!-- enable filtering -->
- <filtering>true</filtering>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <archiveClasses>false</archiveClasses>
+ <webResources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <!-- override the destination directory for this resource -->
+ <targetPath>WEB-INF/classes</targetPath>
+ <!-- enable filtering -->
+ <filtering>true</filtering>
<excludes>
<exclude>*.template</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>${project.build.outputDirectory}</directory>
- <includes>
- <include>META-INF/LICENSE*</include>
- <include>META-INF/NOTICE*</include>
- <include>META-INF/DISCLAIMER*</include>
- </includes>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>${project.build.outputDirectory}</directory>
+ <includes>
+ <include>META-INF/LICENSE*</include>
+ <include>META-INF/NOTICE*</include>
+ <include>META-INF/DISCLAIMER*</include>
+ </includes>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/DataCDInfoAdminServlet.java Fri Jun 25 06:33:41 2010
@@ -1,116 +1,116 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.samples.datacdinfo.web;
-
-import java.io.IOException;
-
-import javax.ejb.EJB;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdminLocal;
-
-/**
- * Servlet implementation class DataCDInfoAdminServlet
- *
- * This servlet is used to demo security annotation usage on EJB.
- */
-public class DataCDInfoAdminServlet extends HttpServlet {
- private static final long serialVersionUID = 1L;
-
- @EJB
- private DataCDInfoAdminLocal admin = null;
-
- /**
- * @see HttpServlet#HttpServlet()
- */
- public DataCDInfoAdminServlet() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @see Servlet#init(ServletConfig)
- */
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- }
-
- /**
- * @see Servlet#destroy()
- */
- public void destroy() {
- // TODO Auto-generated method stub
- }
-
- /**
- * @see HttpServlet#service(HttpServletRequest request, HttpServletResponse
- * response)
- */
- protected void service(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- String action = request.getParameter("action");
-
- if (action.equals("listOwners")) {
- String[] owners = admin.listOwners();
- request.setAttribute("owners", owners);
-
- this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showOwners.jsp").include(request, response);
- }
-
- if (action.equals("listCDs")) {
- String[] cds = admin.listAllDataCDs();
- request.setAttribute("cds", cds);
-
- this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showCDs.jsp").include(request, response);
-
- }
-
- if (action.equals("findpasswd")) {
- String ownername = request.getParameter("ownername");
- String passwd = admin.findpasswd(ownername);
- request.setAttribute("passwd", passwd);
- request.setAttribute("ownername", ownername);
-
- this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showPasswd.jsp").include(request, response);
- }
- }
-
- /**
- * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
- * response)
- */
- protected void doGet(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- service(request, response);
- }
-
- /**
- * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
- * response)
- */
- protected void doPost(HttpServletRequest request,
- HttpServletResponse response) throws ServletException, IOException {
- service(request, response);
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.web;
+
+import java.io.IOException;
+
+import javax.ejb.EJB;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdminLocal;
+
+/**
+ * Servlet implementation class DataCDInfoAdminServlet
+ *
+ * This servlet is used to demo security annotation usage on EJB.
+ */
+public class DataCDInfoAdminServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+
+ @EJB
+ private DataCDInfoAdminLocal admin = null;
+
+ /**
+ * @see HttpServlet#HttpServlet()
+ */
+ public DataCDInfoAdminServlet() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @see Servlet#init(ServletConfig)
+ */
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ }
+
+ /**
+ * @see Servlet#destroy()
+ */
+ public void destroy() {
+ // TODO Auto-generated method stub
+ }
+
+ /**
+ * @see HttpServlet#service(HttpServletRequest request, HttpServletResponse
+ * response)
+ */
+ protected void service(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
+ String action = request.getParameter("action");
+
+ if (action.equals("listOwners")) {
+ String[] owners = admin.listOwners();
+ request.setAttribute("owners", owners);
+
+ this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showOwners.jsp").include(request, response);
+ }
+
+ if (action.equals("listCDs")) {
+ String[] cds = admin.listAllDataCDs();
+ request.setAttribute("cds", cds);
+
+ this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showCDs.jsp").include(request, response);
+
+ }
+
+ if (action.equals("findpasswd")) {
+ String ownername = request.getParameter("ownername");
+ String passwd = admin.findpasswd(ownername);
+ request.setAttribute("passwd", passwd);
+ request.setAttribute("ownername", ownername);
+
+ this.getServletConfig().getServletContext().getRequestDispatcher("/admin/showPasswd.jsp").include(request, response);
+ }
+ }
+
+ /**
+ * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
+ * response)
+ */
+ protected void doGet(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
+ service(request, response);
+ }
+
+ /**
+ * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
+ * response)
+ */
+ protected void doPost(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException, IOException {
+ service(request, response);
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/ListOwnerServlet.java Fri Jun 25 06:33:41 2010
@@ -1,108 +1,108 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.samples.datacdinfo.web;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.PersistenceUnit;
-import javax.persistence.Query;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.transaction.UserTransaction;
-
-/**
- * Servlet implementation class ListOwnerServlet
- *
- * This servlet demo how to use application-managed persistence context
- * to access database. Note that there must inject an UserTransaction resource
- * to manually manage transaction before using EntityManager to query database.
- */
-public class ListOwnerServlet extends HttpServlet {
- private static final long serialVersionUID = 1L;
-
- @PersistenceUnit(unitName="DataCDInfoUnit")
- private EntityManagerFactory emf;
- @Resource
- private UserTransaction utx;
-
- /**
- * @see HttpServlet#HttpServlet()
- */
- public ListOwnerServlet() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- service(request,response);
- }
-
- /**
- * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- // TODO Auto-generated method stub
- service(request,response);
- }
-
- protected void service(HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException {
-
- List<Object[]> owners = new ArrayList<Object[]>();
-
- EntityManager em = emf.createEntityManager();
- try {
- utx.begin();
- Query query = em.createNativeQuery("select * from OWNER_TABLE");
- owners = query.getResultList();
- utx.commit();
- } catch (Exception e){
- e.printStackTrace();
- }
-
- res.setContentType("text/html");
- PrintWriter out = res.getWriter();
-
- out.print("<html>");
- out.print("<head><title>Registered Owners</title></head>");
- out.print("<body>");
-
- for (Object[] owner : owners)
- {
- out.print(owner[0].toString() + "/" + owner[1].toString() + "<br>");
- }
-
- //out.print(System.getProperties());
- out.print("</body>");
- out.print("</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.
+ */
+package org.apache.geronimo.samples.datacdinfo.web;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceUnit;
+import javax.persistence.Query;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.transaction.UserTransaction;
+
+/**
+ * Servlet implementation class ListOwnerServlet
+ *
+ * This servlet demo how to use application-managed persistence context
+ * to access database. Note that there must inject an UserTransaction resource
+ * to manually manage transaction before using EntityManager to query database.
+ */
+public class ListOwnerServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+
+ @PersistenceUnit(unitName="DataCDInfoUnit")
+ private EntityManagerFactory emf;
+ @Resource
+ private UserTransaction utx;
+
+ /**
+ * @see HttpServlet#HttpServlet()
+ */
+ public ListOwnerServlet() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ // TODO Auto-generated method stub
+ service(request,response);
+ }
+
+ /**
+ * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ // TODO Auto-generated method stub
+ service(request,response);
+ }
+
+ protected void service(HttpServletRequest req, HttpServletResponse res)
+ throws ServletException, IOException {
+
+ List<Object[]> owners = new ArrayList<Object[]>();
+
+ EntityManager em = emf.createEntityManager();
+ try {
+ utx.begin();
+ Query query = em.createNativeQuery("select * from OWNER_TABLE");
+ owners = query.getResultList();
+ utx.commit();
+ } catch (Exception e){
+ e.printStackTrace();
+ }
+
+ res.setContentType("text/html");
+ PrintWriter out = res.getWriter();
+
+ out.print("<html>");
+ out.print("<head><title>Registered Owners</title></head>");
+ out.print("<body>");
+
+ for (Object[] owner : owners)
+ {
+ out.print(owner[0].toString() + "/" + owner[1].toString() + "<br>");
+ }
+
+ //out.print(System.getProperties());
+ out.print("</body>");
+ out.print("</html>");
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java Fri Jun 25 06:33:41 2010
@@ -1,116 +1,116 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.samples.datacdinfo.web.struts1;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.geronimo.samples.datacdinfo.beans.DataCDBean;
-import org.apache.geronimo.samples.datacdinfo.beans.OwnerBean;
-import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.actions.MappingDispatchAction;
-
-public class DataCDActions extends MappingDispatchAction {
-
- public static final String DATACD = "datacd";
- public static final String OWNER = "owner";
-
- public DataCDActions() {
- // TODO Auto-generated constructor stub
- }
-
- public ActionForward update(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response)
- throws Exception {
- HttpSession session = request.getSession();
- ServletContext ctx = session.getServletContext();
- DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
-
- DataCDForm form1 = (DataCDForm) form;
- logic.updateCD(form1.getCdID(), form1
- .getCdSize(), form1.getCdDescription(), form1
- .getCdArchiveDate());
-
- refreshOwnerForm(session, logic);
-
- return mapping.findForward("success");
-
- }
-
- public ActionForward add(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response)
- throws Exception {
- HttpSession session = request.getSession();
- ServletContext ctx = session.getServletContext();
- DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
-
- DataCDForm form1 = (DataCDForm) form;
- // add a new CD
- DataCDBean newcd = logic.addCD(form1.getOwner().getUsername(), form1.getCdLabel(), form1
- .getCdSize(), form1.getCdDescription(), form1
- .getCdArchiveDate());
- if (newcd == null){
- ActionMessages errors = new ActionMessages();
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("errors.duplicated.cdlabel"));
- this.saveErrors(request, errors);
- return mapping.getInputForward();
- }
-
- refreshOwnerForm(session, logic);
-
- return mapping.findForward("success");
-
- }
-
- public ActionForward remove(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response)
- throws Exception {
- HttpSession session = request.getSession();
- ServletContext ctx = session.getServletContext();
- DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
-
- DataCDForm form1 = (DataCDForm) form;
- if (logic.removeCD(form1.getCdID())) {
- refreshOwnerForm(session, logic);
- }
-
- return mapping.findForward("success");
-
- }
-
- private void refreshOwnerForm(HttpSession session, DataCDInfoRemote logic)
- throws Exception {
- // refresh owner object
- OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
- String ownername = ownerform.getUsername();
- OwnerBean ownerbean = logic.refreshCDInfo(ownername);
- PropertyUtils.copyProperties(ownerform, ownerbean);
- session.setAttribute(OWNER, ownerform);
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.geronimo.samples.datacdinfo.beans.DataCDBean;
+import org.apache.geronimo.samples.datacdinfo.beans.OwnerBean;
+import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.actions.MappingDispatchAction;
+
+public class DataCDActions extends MappingDispatchAction {
+
+ public static final String DATACD = "datacd";
+ public static final String OWNER = "owner";
+
+ public DataCDActions() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public ActionForward update(ActionMapping mapping, ActionForm form,
+ HttpServletRequest request, HttpServletResponse response)
+ throws Exception {
+ HttpSession session = request.getSession();
+ ServletContext ctx = session.getServletContext();
+ DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+ DataCDForm form1 = (DataCDForm) form;
+ logic.updateCD(form1.getCdID(), form1
+ .getCdSize(), form1.getCdDescription(), form1
+ .getCdArchiveDate());
+
+ refreshOwnerForm(session, logic);
+
+ return mapping.findForward("success");
+
+ }
+
+ public ActionForward add(ActionMapping mapping, ActionForm form,
+ HttpServletRequest request, HttpServletResponse response)
+ throws Exception {
+ HttpSession session = request.getSession();
+ ServletContext ctx = session.getServletContext();
+ DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+ DataCDForm form1 = (DataCDForm) form;
+ // add a new CD
+ DataCDBean newcd = logic.addCD(form1.getOwner().getUsername(), form1.getCdLabel(), form1
+ .getCdSize(), form1.getCdDescription(), form1
+ .getCdArchiveDate());
+ if (newcd == null){
+ ActionMessages errors = new ActionMessages();
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("errors.duplicated.cdlabel"));
+ this.saveErrors(request, errors);
+ return mapping.getInputForward();
+ }
+
+ refreshOwnerForm(session, logic);
+
+ return mapping.findForward("success");
+
+ }
+
+ public ActionForward remove(ActionMapping mapping, ActionForm form,
+ HttpServletRequest request, HttpServletResponse response)
+ throws Exception {
+ HttpSession session = request.getSession();
+ ServletContext ctx = session.getServletContext();
+ DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+ DataCDForm form1 = (DataCDForm) form;
+ if (logic.removeCD(form1.getCdID())) {
+ refreshOwnerForm(session, logic);
+ }
+
+ return mapping.findForward("success");
+
+ }
+
+ private void refreshOwnerForm(HttpSession session, DataCDInfoRemote logic)
+ throws Exception {
+ // refresh owner object
+ OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
+ String ownername = ownerform.getUsername();
+ OwnerBean ownerbean = logic.refreshCDInfo(ownername);
+ PropertyUtils.copyProperties(ownerform, ownerbean);
+ session.setAttribute(OWNER, ownerform);
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java Fri Jun 25 06:33:41 2010
@@ -1,86 +1,86 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.samples.datacdinfo.web.struts1;
-
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.validator.ValidatorActionForm;
-import java.sql.Date;
-
-import javax.servlet.http.HttpServletRequest;
-
-public class DataCDForm extends ValidatorActionForm {
- /**
- *
- */
- private static final long serialVersionUID = -2878208025571945031L;
-
- private Integer cdID = null;
- private String cdLabel = null;
- private String cdDescription = null;
- private Integer cdSize = null;
- private Date cdArchiveDate = null;
- private OwnerForm owner = new OwnerForm();
-
- public Integer getCdID() {
- return cdID;
- }
- public void setCdID(Integer cdID) {
- this.cdID = cdID;
- }
- public String getCdLabel() {
- return cdLabel;
- }
- public void setCdLabel(String cdLabel) {
- this.cdLabel = cdLabel;
- }
- public String getCdDescription() {
- return cdDescription;
- }
- public void setCdDescription(String cdDescription) {
- this.cdDescription = cdDescription;
- }
- public Integer getCdSize() {
- return cdSize;
- }
- public void setCdSize(Integer cdSize) {
- this.cdSize = cdSize;
- }
- public Date getCdArchiveDate() {
- return cdArchiveDate;
- }
- public void setCdArchiveDate(Date cdArchiveDate) {
- this.cdArchiveDate = cdArchiveDate;
- }
- public OwnerForm getOwner() {
- return owner;
- }
- public void setOwner(OwnerForm owner) {
- this.owner = owner;
- }
-
- public void reset(ActionMapping mapping, HttpServletRequest request) {
- cdID = null;
- cdLabel = null;
- cdDescription = null;
- cdSize = null;
- cdArchiveDate = null;
- owner = new OwnerForm();
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.validator.ValidatorActionForm;
+import java.sql.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class DataCDForm extends ValidatorActionForm {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2878208025571945031L;
+
+ private Integer cdID = null;
+ private String cdLabel = null;
+ private String cdDescription = null;
+ private Integer cdSize = null;
+ private Date cdArchiveDate = null;
+ private OwnerForm owner = new OwnerForm();
+
+ public Integer getCdID() {
+ return cdID;
+ }
+ public void setCdID(Integer cdID) {
+ this.cdID = cdID;
+ }
+ public String getCdLabel() {
+ return cdLabel;
+ }
+ public void setCdLabel(String cdLabel) {
+ this.cdLabel = cdLabel;
+ }
+ public String getCdDescription() {
+ return cdDescription;
+ }
+ public void setCdDescription(String cdDescription) {
+ this.cdDescription = cdDescription;
+ }
+ public Integer getCdSize() {
+ return cdSize;
+ }
+ public void setCdSize(Integer cdSize) {
+ this.cdSize = cdSize;
+ }
+ public Date getCdArchiveDate() {
+ return cdArchiveDate;
+ }
+ public void setCdArchiveDate(Date cdArchiveDate) {
+ this.cdArchiveDate = cdArchiveDate;
+ }
+ public OwnerForm getOwner() {
+ return owner;
+ }
+ public void setOwner(OwnerForm owner) {
+ this.owner = owner;
+ }
+
+ public void reset(ActionMapping mapping, HttpServletRequest request) {
+ cdID = null;
+ cdLabel = null;
+ cdDescription = null;
+ cdSize = null;
+ cdArchiveDate = null;
+ owner = new OwnerForm();
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java Fri Jun 25 06:33:41 2010
@@ -1,53 +1,53 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.samples.datacdinfo.web.struts1;
-
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import javax.ejb.EJB;
-
-import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
-
-public class DataCDInfoContextListener implements ServletContextListener {
- private ServletContext ctx = null;
- @EJB
- private DataCDInfoRemote logic = null;
-
-
- public void contextDestroyed(ServletContextEvent event) {
- ctx = event.getServletContext();
- ctx.removeAttribute("logic");
- }
-
-
- public void contextInitialized(ServletContextEvent event) {
- ctx = event.getServletContext();
-
- if (logic instanceof DataCDInfoRemote) {
- ctx.setAttribute("logic", logic);
- System.out.println(">>>>>>>>>>>>>>>>>>>>> Injected ejb DataCDInfoJTAImpl!");
- } else {
- System.out.println(">>>>>>>>>>>>>>>>>>>>> Cannot inject ejb DataCDInfoJTAImpl!");
- }
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import javax.ejb.EJB;
+
+import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
+
+public class DataCDInfoContextListener implements ServletContextListener {
+ private ServletContext ctx = null;
+ @EJB
+ private DataCDInfoRemote logic = null;
+
+
+ public void contextDestroyed(ServletContextEvent event) {
+ ctx = event.getServletContext();
+ ctx.removeAttribute("logic");
+ }
+
+
+ public void contextInitialized(ServletContextEvent event) {
+ ctx = event.getServletContext();
+
+ if (logic instanceof DataCDInfoRemote) {
+ ctx.setAttribute("logic", logic);
+ System.out.println(">>>>>>>>>>>>>>>>>>>>> Injected ejb DataCDInfoJTAImpl!");
+ } else {
+ System.out.println(">>>>>>>>>>>>>>>>>>>>> Cannot inject ejb DataCDInfoJTAImpl!");
+ }
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java Fri Jun 25 06:33:41 2010
@@ -1,114 +1,114 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.samples.datacdinfo.web.struts1;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.geronimo.samples.datacdinfo.beans.OwnerBean;
-import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
-import org.apache.geronimo.samples.datacdinfo.exceptions.IncorrectPasswordException;
-import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidOwnerException;
-import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidPasswordException;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
-import org.apache.struts.action.ActionMessage;
-import org.apache.struts.action.ActionMessages;
-import org.apache.struts.actions.MappingDispatchAction;
-
-public class OwnerActions extends MappingDispatchAction {
- public static final String OWNER = "owner";
-
- public ActionForward logon(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response)
- throws Exception {
- HttpSession session = request.getSession();
- OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
- if (ownerform == null) {
- ServletContext ctx = session.getServletContext();
- DataCDInfoRemote logic = (DataCDInfoRemote) ctx
- .getAttribute("logic");
- OwnerBean owner = new OwnerBean();
- PropertyUtils.copyProperties(owner, form);
-
- try {
- OwnerBean loginuser = logic.login(owner.getUsername(), owner
- .getPassword());
- PropertyUtils.copyProperties(form, loginuser);
- } catch (Exception e) {
- e.printStackTrace();
- ActionMessages errors = new ActionMessages();
- if (e instanceof InvalidOwnerException) {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("errors.invalid.owner"));
-
- }
- if (e instanceof IncorrectPasswordException) {
- errors.add(ActionMessages.GLOBAL_MESSAGE,
- new ActionMessage("errors.incorrect.password"));
- }
- this.saveErrors(request, errors);
- return mapping.getInputForward();
- }
- session.setAttribute(OWNER, form);
-
- }
-
- return mapping.findForward("success");
- }
-
- public ActionForward register(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response)
- throws Exception {
- HttpSession session = request.getSession();
-
- ServletContext ctx = session.getServletContext();
- DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
- OwnerBean owner = new OwnerBean();
- PropertyUtils.copyProperties(owner, form);
-
- try {
- OwnerBean loginuser = logic.register(owner.getUsername(), owner
- .getPassword());
- PropertyUtils.copyProperties(form, loginuser);
- } catch (Exception e) {
- System.out.println(e.getMessage());
- ActionMessages errors = new ActionMessages();
- if (e instanceof InvalidOwnerException) {
- errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
- "errors.existing.owner"));
-
- }
- if (e instanceof InvalidPasswordException) {
- errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
- "errors.invalid.password"));
- }
- this.saveErrors(request, errors);
- return mapping.getInputForward();
- }
- session.setAttribute(OWNER, form);
-
- return mapping.findForward("success");
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.geronimo.samples.datacdinfo.beans.OwnerBean;
+import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
+import org.apache.geronimo.samples.datacdinfo.exceptions.IncorrectPasswordException;
+import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidOwnerException;
+import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidPasswordException;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.actions.MappingDispatchAction;
+
+public class OwnerActions extends MappingDispatchAction {
+ public static final String OWNER = "owner";
+
+ public ActionForward logon(ActionMapping mapping, ActionForm form,
+ HttpServletRequest request, HttpServletResponse response)
+ throws Exception {
+ HttpSession session = request.getSession();
+ OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
+ if (ownerform == null) {
+ ServletContext ctx = session.getServletContext();
+ DataCDInfoRemote logic = (DataCDInfoRemote) ctx
+ .getAttribute("logic");
+ OwnerBean owner = new OwnerBean();
+ PropertyUtils.copyProperties(owner, form);
+
+ try {
+ OwnerBean loginuser = logic.login(owner.getUsername(), owner
+ .getPassword());
+ PropertyUtils.copyProperties(form, loginuser);
+ } catch (Exception e) {
+ e.printStackTrace();
+ ActionMessages errors = new ActionMessages();
+ if (e instanceof InvalidOwnerException) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("errors.invalid.owner"));
+
+ }
+ if (e instanceof IncorrectPasswordException) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE,
+ new ActionMessage("errors.incorrect.password"));
+ }
+ this.saveErrors(request, errors);
+ return mapping.getInputForward();
+ }
+ session.setAttribute(OWNER, form);
+
+ }
+
+ return mapping.findForward("success");
+ }
+
+ public ActionForward register(ActionMapping mapping, ActionForm form,
+ HttpServletRequest request, HttpServletResponse response)
+ throws Exception {
+ HttpSession session = request.getSession();
+
+ ServletContext ctx = session.getServletContext();
+ DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+ OwnerBean owner = new OwnerBean();
+ PropertyUtils.copyProperties(owner, form);
+
+ try {
+ OwnerBean loginuser = logic.register(owner.getUsername(), owner
+ .getPassword());
+ PropertyUtils.copyProperties(form, loginuser);
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ ActionMessages errors = new ActionMessages();
+ if (e instanceof InvalidOwnerException) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+ "errors.existing.owner"));
+
+ }
+ if (e instanceof InvalidPasswordException) {
+ errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+ "errors.invalid.password"));
+ }
+ this.saveErrors(request, errors);
+ return mapping.getInputForward();
+ }
+ session.setAttribute(OWNER, form);
+
+ return mapping.findForward("success");
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java Fri Jun 25 06:33:41 2010
@@ -1,70 +1,70 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.samples.datacdinfo.web.struts1;
-
-import java.util.Collection;
-
-import org.apache.struts.validator.ValidatorForm;
-
-public class OwnerForm extends ValidatorForm {
-
- /**
- *
- */
- private static final long serialVersionUID = 8367551067568662573L;
- private String username;
- private String password;
- private String password2;
-
-
- private Collection<DataCDForm> DataCDs;
-
- public Collection<DataCDForm> getDataCDs() {
- return DataCDs;
- }
-
- public void setDataCDs(Collection<DataCDForm> dataCDs) {
- DataCDs = dataCDs;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- public String getPassword() {
- return password;
- }
-
- public String getPassword2() {
- return password2;
- }
-
- public void setPassword2(String password2) {
- this.password2 = password2;
- }
-
-}
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import java.util.Collection;
+
+import org.apache.struts.validator.ValidatorForm;
+
+public class OwnerForm extends ValidatorForm {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8367551067568662573L;
+ private String username;
+ private String password;
+ private String password2;
+
+
+ private Collection<DataCDForm> DataCDs;
+
+ public Collection<DataCDForm> getDataCDs() {
+ return DataCDs;
+ }
+
+ public void setDataCDs(Collection<DataCDForm> dataCDs) {
+ DataCDs = dataCDs;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public String getPassword2() {
+ return password2;
+ }
+
+ public void setPassword2(String password2) {
+ this.password2 = password2;
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties Fri Jun 25 06:33:41 2010
@@ -1,60 +1,60 @@
-# 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.
-
-logon.title=DataCDInfo Logon
-register.title=Register A New User
-prompt.username=Username
-prompt.password=Password
-prompt.password2=Retype Password
-errors.invalid.owner=Invalid owner!
-errors.incorrect.password=Incorrect password!
-errors.existing.owner=Owner existed!
-errors.invalid.password=Invalid password!
-datacd.cdlabel=CD Label
-datacd.cddescription=Content Description
-datacd.cdsize=Size(Mbytes)
-datacd.cdarchivedate=Archive Date
-datacd.operations=Operations
-datacd.operation.add=Add
-datacd.operation.edit=Update
-datacd.operation.remove=Remove
-datacd.operation.logout=Log Out
-datacd.operation.back=Return to list
-general.welcome=Welcome
-general.register=Register?
-general.administration=Administration
-button.submit=Submit
-button.reset=Reset
-button.update=Update
-button.remove=Confirm to remove
-button.add=Add
-errors.duplicated.cdlabel=Duplicated CD Label!
-
-# Standard error messages for validator framework checks
-errors.required={0} is required.
-errors.minlength={0} cannot be less than {1} characters.
-errors.maxlength={0} cannot be greater than {1} characters.
-errors.invalid={0} is invalid.
-errors.byte={0} must be an byte.
-errors.short={0} must be an short.
-errors.integer={0} must be an integer.
-errors.long={0} must be an long.
-errors.float={0} must be an float.
-errors.double={0} must be an double.
-errors.date={0} is not a date.
-errors.range={0} is not in the range {1} through {2}.
-errors.creditcard={0} is not a valid credit card number.
-errors.email={0} is an invalid e-mail address.
-errors.literal={0}
+# 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.
+
+logon.title=DataCDInfo Logon
+register.title=Register A New User
+prompt.username=Username
+prompt.password=Password
+prompt.password2=Retype Password
+errors.invalid.owner=Invalid owner!
+errors.incorrect.password=Incorrect password!
+errors.existing.owner=Owner existed!
+errors.invalid.password=Invalid password!
+datacd.cdlabel=CD Label
+datacd.cddescription=Content Description
+datacd.cdsize=Size(Mbytes)
+datacd.cdarchivedate=Archive Date
+datacd.operations=Operations
+datacd.operation.add=Add
+datacd.operation.edit=Update
+datacd.operation.remove=Remove
+datacd.operation.logout=Log Out
+datacd.operation.back=Return to list
+general.welcome=Welcome
+general.register=Register?
+general.administration=Administration
+button.submit=Submit
+button.reset=Reset
+button.update=Update
+button.remove=Confirm to remove
+button.add=Add
+errors.duplicated.cdlabel=Duplicated CD Label!
+
+# Standard error messages for validator framework checks
+errors.required={0} is required.
+errors.minlength={0} cannot be less than {1} characters.
+errors.maxlength={0} cannot be greater than {1} characters.
+errors.invalid={0} is invalid.
+errors.byte={0} must be an byte.
+errors.short={0} must be an short.
+errors.integer={0} must be an integer.
+errors.long={0} must be an long.
+errors.float={0} must be an float.
+errors.double={0} must be an double.
+errors.date={0} is not a date.
+errors.range={0} is not in the range {1} through {2}.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is an invalid e-mail address.
+errors.literal={0}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties Fri Jun 25 06:33:41 2010
@@ -1,60 +1,60 @@
-# 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.
-
-logon.title=DataCDInfo Logon
-register.title=Register A New User
-prompt.username=Username
-prompt.password=Password
-prompt.password2=Retype Password
-errors.invalid.owner=Invalid owner!
-errors.incorrect.password=Incorrect password!
-errors.existing.owner=Owner existed!
-errors.invalid.password=Invalid password!
-datacd.cdlabel=CD Label
-datacd.cddescription=Content Description
-datacd.cdsize=Size(Mbytes)
-datacd.cdarchivedate=Archive Date
-datacd.operations=Operations
-datacd.operation.add=Add
-datacd.operation.edit=Update
-datacd.operation.remove=Remove
-datacd.operation.logout=Log Out
-datacd.operation.back=Return to list
-general.welcome=Welcome
-general.register=Register?
-general.administration=Administration
-button.submit=Submit
-button.reset=Reset
-button.update=Update
-button.remove=Confirm to remove
-button.add=Add
-errors.duplicated.cdlabel=Duplicated CD Label!
-
-# Standard error messages for validator framework checks
-errors.required={0} is required.
-errors.minlength={0} cannot be less than {1} characters.
-errors.maxlength={0} cannot be greater than {1} characters.
-errors.invalid={0} is invalid.
-errors.byte={0} must be an byte.
-errors.short={0} must be an short.
-errors.integer={0} must be an integer.
-errors.long={0} must be an long.
-errors.float={0} must be an float.
-errors.double={0} must be an double.
-errors.date={0} is not a date.
-errors.range={0} is not in the range {1} through {2}.
-errors.creditcard={0} is not a valid credit card number.
-errors.email={0} is an invalid e-mail address.
-errors.literal={0}
+# 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.
+
+logon.title=DataCDInfo Logon
+register.title=Register A New User
+prompt.username=Username
+prompt.password=Password
+prompt.password2=Retype Password
+errors.invalid.owner=Invalid owner!
+errors.incorrect.password=Incorrect password!
+errors.existing.owner=Owner existed!
+errors.invalid.password=Invalid password!
+datacd.cdlabel=CD Label
+datacd.cddescription=Content Description
+datacd.cdsize=Size(Mbytes)
+datacd.cdarchivedate=Archive Date
+datacd.operations=Operations
+datacd.operation.add=Add
+datacd.operation.edit=Update
+datacd.operation.remove=Remove
+datacd.operation.logout=Log Out
+datacd.operation.back=Return to list
+general.welcome=Welcome
+general.register=Register?
+general.administration=Administration
+button.submit=Submit
+button.reset=Reset
+button.update=Update
+button.remove=Confirm to remove
+button.add=Add
+errors.duplicated.cdlabel=Duplicated CD Label!
+
+# Standard error messages for validator framework checks
+errors.required={0} is required.
+errors.minlength={0} cannot be less than {1} characters.
+errors.maxlength={0} cannot be greater than {1} characters.
+errors.invalid={0} is invalid.
+errors.byte={0} must be an byte.
+errors.short={0} must be an short.
+errors.integer={0} must be an integer.
+errors.long={0} must be an long.
+errors.float={0} must be an float.
+errors.double={0} must be an double.
+errors.date={0} is not a date.
+errors.range={0} is not in the range {1} through {2}.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is an invalid e-mail address.
+errors.literal={0}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties Fri Jun 25 06:33:41 2010
@@ -1,60 +1,60 @@
-# 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.
-
-logon.title=\u6570\u636e\u76d8\u4fe1\u606f\u767b\u8bb0\u7cfb\u7edf\u767b\u5f55
-register.title=\u6ce8\u518c\u4e00\u4e2a\u65b0\u7684\u7528\u6237
-prompt.username=\u7528\u6237\u540d
-prompt.password=\u5bc6\u7801
-prompt.password2=\u518d\u6b21\u8f93\u5165\u5bc6\u7801
-errors.invalid.owner=\u65e0\u6548\u7528\u6237\uff01
-errors.incorrect.password=\u5bc6\u7801\u9519\u8bef\uff01
-errors.existing.owner=\u7528\u6237\u5df2\u5b58\u5728\uff01
-errors.invalid.password=\u65e0\u6548\u5bc6\u7801\uff01
-datacd.cdlabel=\u6570\u636e\u76d8\u6807\u7b7e
-datacd.cddescription=\u5185\u5bb9\u63cf\u8ff0
-datacd.cdsize=\u5927\u5c0f(\u5146\u5b57\u8282)
-datacd.cdarchivedate=\u5b58\u6863\u65e5\u671f
-datacd.operations=\u64cd\u4f5c
-datacd.operation.add=\u6dfb\u52a0
-datacd.operation.edit=\u66f4\u65b0
-datacd.operation.remove=\u5220\u9664
-datacd.operation.logout=\u767b\u51fa
-datacd.operation.back=\u8fd4\u56de\u5217\u8868
-general.welcome=\u6b22\u8fce
-general.register=\u6ce8\u518c\uff1f
-general.administration=\u7ba1\u7406
-button.submit=\u63d0\u4ea4
-button.reset=\u91cd\u7f6e
-button.update=\u66f4\u65b0
-button.remove=\u786e\u8ba4\u5220\u9664
-button.add=\u6dfb\u52a0
-errors.duplicated.cdlabel=\u91cd\u590d\u7684\u6570\u636e\u76d8\u6807\u7b7e!
-
-# Standard error messages for validator framework checks
-errors.required={0} \u662f\u5fc5\u987b\u7684\u3002
-errors.minlength={0} \u4e0d\u80fd\u5c11\u4e8e {1} \u4e2a\u82f1\u6587\u5b57\u7b26\u3002
-errors.maxlength={0} \u4e0d\u80fd\u5927\u4e8e {1} \u4e2a\u82f1\u6587\u5b57\u7b26\u3002
-errors.invalid={0} \u662f\u65e0\u6548\u7684\u3002
-errors.byte={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u5b57\u8282\u3002
-errors.short={0} \u5fc5\u987b\u662f\u77ed\u6574\u6570\u3002
-errors.integer={0} \u5fc5\u987b\u662f\u6574\u6570\u3002
-errors.long={0} \u5fc5\u987b\u662f\u957f\u6574\u6570\u3002
-errors.float={0} \u5fc5\u987b\u662f\u6d6e\u70b9\u6570\u3002
-errors.double={0} \u5fc5\u987b\u662f\u53cc\u7cbe\u5ea6\u6d6e\u70b9\u6570\u3002
-errors.date={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u65e5\u671f\u3002
-errors.range={0} \u4e0d\u5728 {1} \u548c {2} \u4e4b\u95f4\u3002
-errors.creditcard={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u4fe1\u7528\u5361\u5e10\u53f7\u3002
-errors.email={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002
-errors.literal={0}
+# 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.
+
+logon.title=\u6570\u636e\u76d8\u4fe1\u606f\u767b\u8bb0\u7cfb\u7edf\u767b\u5f55
+register.title=\u6ce8\u518c\u4e00\u4e2a\u65b0\u7684\u7528\u6237
+prompt.username=\u7528\u6237\u540d
+prompt.password=\u5bc6\u7801
+prompt.password2=\u518d\u6b21\u8f93\u5165\u5bc6\u7801
+errors.invalid.owner=\u65e0\u6548\u7528\u6237\uff01
+errors.incorrect.password=\u5bc6\u7801\u9519\u8bef\uff01
+errors.existing.owner=\u7528\u6237\u5df2\u5b58\u5728\uff01
+errors.invalid.password=\u65e0\u6548\u5bc6\u7801\uff01
+datacd.cdlabel=\u6570\u636e\u76d8\u6807\u7b7e
+datacd.cddescription=\u5185\u5bb9\u63cf\u8ff0
+datacd.cdsize=\u5927\u5c0f(\u5146\u5b57\u8282)
+datacd.cdarchivedate=\u5b58\u6863\u65e5\u671f
+datacd.operations=\u64cd\u4f5c
+datacd.operation.add=\u6dfb\u52a0
+datacd.operation.edit=\u66f4\u65b0
+datacd.operation.remove=\u5220\u9664
+datacd.operation.logout=\u767b\u51fa
+datacd.operation.back=\u8fd4\u56de\u5217\u8868
+general.welcome=\u6b22\u8fce
+general.register=\u6ce8\u518c\uff1f
+general.administration=\u7ba1\u7406
+button.submit=\u63d0\u4ea4
+button.reset=\u91cd\u7f6e
+button.update=\u66f4\u65b0
+button.remove=\u786e\u8ba4\u5220\u9664
+button.add=\u6dfb\u52a0
+errors.duplicated.cdlabel=\u91cd\u590d\u7684\u6570\u636e\u76d8\u6807\u7b7e!
+
+# Standard error messages for validator framework checks
+errors.required={0} \u662f\u5fc5\u987b\u7684\u3002
+errors.minlength={0} \u4e0d\u80fd\u5c11\u4e8e {1} \u4e2a\u82f1\u6587\u5b57\u7b26\u3002
+errors.maxlength={0} \u4e0d\u80fd\u5927\u4e8e {1} \u4e2a\u82f1\u6587\u5b57\u7b26\u3002
+errors.invalid={0} \u662f\u65e0\u6548\u7684\u3002
+errors.byte={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u5b57\u8282\u3002
+errors.short={0} \u5fc5\u987b\u662f\u77ed\u6574\u6570\u3002
+errors.integer={0} \u5fc5\u987b\u662f\u6574\u6570\u3002
+errors.long={0} \u5fc5\u987b\u662f\u957f\u6574\u6570\u3002
+errors.float={0} \u5fc5\u987b\u662f\u6d6e\u70b9\u6570\u3002
+errors.double={0} \u5fc5\u987b\u662f\u53cc\u7cbe\u5ea6\u6d6e\u70b9\u6570\u3002
+errors.date={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u65e5\u671f\u3002
+errors.range={0} \u4e0d\u5728 {1} \u548c {2} \u4e4b\u95f4\u3002
+errors.creditcard={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u4fe1\u7528\u5361\u5e10\u53f7\u3002
+errors.email={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002
+errors.literal={0}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun 25 06:33:41 2010
@@ -1,38 +1,38 @@
-<?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.
--->
-<web:web-app xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
- xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
- xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
- xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:pers="http://java.sun.com/xml/ns/persistence"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
- xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.samples</dep:groupId>
- <dep:artifactId>DataCDInfo</dep:artifactId>
- <dep:version>1.0</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
-
- </dep:environment>
- <web:context-root>/DataCDInfo</web:context-root>
- <web:security-realm-name>geronimo-admin</web:security-realm-name>
-</web:web-app>
+<?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.
+-->
+<web:web-app xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
+ xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
+ xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
+ xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
+ xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:pers="http://java.sun.com/xml/ns/persistence"
+ xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <dep:environment>
+ <dep:moduleId>
+ <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+ <dep:artifactId>DataCDInfo</dep:artifactId>
+ <dep:version>1.0</dep:version>
+ <dep:type>car</dep:type>
+ </dep:moduleId>
+
+ </dep:environment>
+ <web:context-root>/DataCDInfo</web:context-root>
+ <web:security-realm-name>geronimo-admin</web:security-realm-name>
+</web:web-app>