openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r801766 - in /openjpa/sandboxes/dwoods/sample: ./ customers-ejb/src/main/java/org/apache/openjpa/examples/ customers-ejb/src/main/java/org/apache/openjpa/examples/customers/entities/ customers-ejb/src/main/java/org/apache/openjpa/examples/c...
Date Thu, 06 Aug 2009 18:39:03 GMT
Author: dwoods
Date: Thu Aug  6 18:39:02 2009
New Revision: 801766

URL: http://svn.apache.org/viewvc?rev=801766&view=rev
Log:
OPENJPA-1231 rename packages and fix pom depends

Added:
    openjpa/sandboxes/dwoods/sample/checkstyle.xml   (with props)
    openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/
      - copied from r801745, openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/openjpa-examples/
    openjpa/sandboxes/dwoods/sample/customers-war/src/main/java/org/apache/openjpa/examples/
      - copied from r801745, openjpa/sandboxes/dwoods/sample/customers-war/src/main/java/org/apache/openjpa/openjpa-examples/
Removed:
    openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/openjpa-examples/
    openjpa/sandboxes/dwoods/sample/customers-war/src/main/java/org/apache/openjpa/openjpa-examples/
Modified:
    openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/entities/JPACustomer.java
    openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/Company.java
    openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/CompanyBean.java
    openjpa/sandboxes/dwoods/sample/customers-war/src/main/java/org/apache/openjpa/examples/customers/web/CompanyServlet.java
    openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/WEB-INF/web.xml
    openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/list.jsp
    openjpa/sandboxes/dwoods/sample/pom.xml

Added: openjpa/sandboxes/dwoods/sample/checkstyle.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/dwoods/sample/checkstyle.xml?rev=801766&view=auto
==============================================================================
--- openjpa/sandboxes/dwoods/sample/checkstyle.xml (added)
+++ openjpa/sandboxes/dwoods/sample/checkstyle.xml Thu Aug  6 18:39:02 2009
@@ -0,0 +1,37 @@
+<?xml version="1.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.   
+-->
+<!DOCTYPE module PUBLIC
+  "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+  "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!-- This is a temporary file.
+     As we get closer to enforcing the OpenJPA style to be like the 
+     default Sun Microsystems Definition default file, then
+     we can remove this file and remove the reference from the
+     pom.xml -->
+
+<module name="Checker">
+    <module name="NewlineAtEndOfFile"/>
+    <module name="TreeWalker">
+        <module name="LineLength">
+        <property name="max" value="120"/>
+        </module>
+    </module>
+</module>

Propchange: openjpa/sandboxes/dwoods/sample/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/entities/JPACustomer.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/entities/JPACustomer.java?rev=801766&r1=801745&r2=801766&view=diff
==============================================================================
--- openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/entities/JPACustomer.java
(original)
+++ openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/entities/JPACustomer.java
Thu Aug  6 18:39:02 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openjpa.openjpa-examples.customers.entities;
+package org.apache.openjpa.examples.customers.entities;
 
 import java.io.Serializable;
 import java.util.Date;

Modified: openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/Company.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/Company.java?rev=801766&r1=801745&r2=801766&view=diff
==============================================================================
--- openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/Company.java
(original)
+++ openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/Company.java
Thu Aug  6 18:39:02 2009
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openjpa.openjpa-examples.customers.stateless;
+package org.apache.openjpa.examples.customers.stateless;
 
 import java.util.List;
 
-import org.apache.openjpa.openjpa-examples.customers.entities.JPACustomer;
+import org.apache.openjpa.examples.customers.entities.JPACustomer;
 
 public interface Company {
 

Modified: openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/CompanyBean.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/CompanyBean.java?rev=801766&r1=801745&r2=801766&view=diff
==============================================================================
--- openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/CompanyBean.java
(original)
+++ openjpa/sandboxes/dwoods/sample/customers-ejb/src/main/java/org/apache/openjpa/examples/customers/stateless/CompanyBean.java
Thu Aug  6 18:39:02 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openjpa.openjpa-examples.customers.stateless;
+package org.apache.openjpa.examples.customers.stateless;
 
 import java.util.List;
 
@@ -26,7 +26,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 
-import org.apache.openjpa.openjpa-examples.customers.entities.JPACustomer;
+import org.apache.openjpa.examples.customers.entities.JPACustomer;
 
 @Remote( Company.class )
 @Stateless

Modified: openjpa/sandboxes/dwoods/sample/customers-war/src/main/java/org/apache/openjpa/examples/customers/web/CompanyServlet.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/dwoods/sample/customers-war/src/main/java/org/apache/openjpa/examples/customers/web/CompanyServlet.java?rev=801766&r1=801745&r2=801766&view=diff
==============================================================================
--- openjpa/sandboxes/dwoods/sample/customers-war/src/main/java/org/apache/openjpa/examples/customers/web/CompanyServlet.java
(original)
+++ openjpa/sandboxes/dwoods/sample/customers-war/src/main/java/org/apache/openjpa/examples/customers/web/CompanyServlet.java
Thu Aug  6 18:39:02 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.openjpa.openjpa-examples.customers.web;
+package org.apache.openjpa.examples.customers.web;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -30,8 +30,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.openjpa.openjpa-examples.customers.entities.JPACustomer;
-import org.apache.openjpa.openjpa-examples.customers.stateless.Company;
+import org.apache.openjpa.examples.customers.entities.JPACustomer;
+import org.apache.openjpa.examples.customers.stateless.Company;
 
 public class CompanyServlet extends HttpServlet {
 

Modified: openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/WEB-INF/web.xml?rev=801766&r1=801765&r2=801766&view=diff
==============================================================================
--- openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/WEB-INF/web.xml (original)
+++ openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/WEB-INF/web.xml Thu Aug
 6 18:39:02 2009
@@ -1,5 +1,22 @@
 <?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-app xmlns="http://java.sun.com/xml/ns/javaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 	http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
@@ -10,7 +27,7 @@
 
     <servlet>
         <servlet-name>company</servlet-name>
-        <servlet-class>org.apache.openjpa.openjpa-examples.customers.web.CompanyServlet</servlet-class>
+        <servlet-class>org.apache.openjpa.examples.customers.web.CompanyServlet</servlet-class>
     </servlet>
 
     <servlet-mapping>

Modified: openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/list.jsp
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/list.jsp?rev=801766&r1=801765&r2=801766&view=diff
==============================================================================
--- openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/list.jsp (original)
+++ openjpa/sandboxes/dwoods/sample/customers-war/src/main/webapp/list.jsp Thu Aug  6 18:39:02
2009
@@ -18,7 +18,7 @@
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
     pageEncoding="ISO-8859-1"%>
 <%@ page import="java.util.*" %>
-<%@ page import="org.apache.openjpa-openjpa-examples.customers.entities.*" %>
+<%@ page import="org.apache.openjpa.examples.customers.entities.*" %>
 <%@ page import="java.text.SimpleDateFormat" %>
 <%@ page import="java.text.DecimalFormat" %>
 

Modified: openjpa/sandboxes/dwoods/sample/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/dwoods/sample/pom.xml?rev=801766&r1=801765&r2=801766&view=diff
==============================================================================
--- openjpa/sandboxes/dwoods/sample/pom.xml (original)
+++ openjpa/sandboxes/dwoods/sample/pom.xml Thu Aug  6 18:39:02 2009
@@ -21,15 +21,35 @@
 
     <parent>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa-examples</artifactId>
+        <artifactId>openjpa-parent</artifactId>
         <version>2.0.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>org.apache.openjpa.openjpa-examples</groupId>
     <artifactId>customers</artifactId>
     <packaging>pom</packaging>
     <name>Apache OpenJPA Examples :: Customers</name>
     <description>Apache OpenJPA Customers Example which uses JSP + JPA + BV</description>
-    
+
+    <properties>
+        <checkstyle.config.location>${basedir}/../checkstyle.xml</checkstyle.config.location>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                <version>1.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>customers-ejb</module>
         <module>customers-war</module>



Mime
View raw message