You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/05/11 22:41:57 UTC

svn commit: r773681 - in /openjpa/sandboxes/openjpa-eclipse-plugin: ./ eclipse/ plugins/ plugins/org.apache.openjpa.eclipse/ plugins/org.apache.openjpa.eclipse/META-INF/

Author: dwoods
Date: Mon May 11 20:41:57 2009
New Revision: 773681

URL: http://svn.apache.org/viewvc?rev=773681&view=rev
Log:
OPENJPA-1080 still has compile errors

Added:
    openjpa/sandboxes/openjpa-eclipse-plugin/checkstyle.xml   (with props)
    openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/.options
    openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/META-INF/
    openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/META-INF/MANIFEST.MF   (with props)
    openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/about.ini
    openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.properties   (with props)
    openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.xml
    openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/pom.xml   (with props)
Modified:
    openjpa/sandboxes/openjpa-eclipse-plugin/eclipse/pom.xml
    openjpa/sandboxes/openjpa-eclipse-plugin/plugins/pom.xml
    openjpa/sandboxes/openjpa-eclipse-plugin/pom.xml

Added: openjpa/sandboxes/openjpa-eclipse-plugin/checkstyle.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/checkstyle.xml?rev=773681&view=auto
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/checkstyle.xml (added)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/checkstyle.xml Mon May 11 20:41:57 2009
@@ -0,0 +1,34 @@
+<?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="TreeWalker">
+        <!-- <module name="LineLength"/> -->
+    </module>
+</module>

Propchange: openjpa/sandboxes/openjpa-eclipse-plugin/checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/sandboxes/openjpa-eclipse-plugin/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/eclipse/pom.xml?rev=773681&r1=773680&r2=773681&view=diff
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/eclipse/pom.xml (original)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/eclipse/pom.xml Mon May 11 20:41:57 2009
@@ -18,18 +18,18 @@
 <project>
                                                 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>eclipse</artifactId>
-    <packaging>pom</packaging>
-    <name>Geronimo Eclipse Plugin :: Eclipse</name>
                                                 
     <parent>
-        <groupId>org.apache.geronimo.devtools</groupId>
-        <artifactId>geronimo-eclipse-plugin</artifactId>
-        <version>2.1.4</version>
-        <relativePath>../pom.xml</relativePath>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa-eclipse-plugin</artifactId>
+        <version>2.0.0</version>
     </parent>
                                                 
+    <groupId>org.apache.openjpa.openjpa-eclipse-plugin</groupId>
+    <artifactId>eclipse</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Eclipse Plugin :: Eclipse</name>
+
     <build>
         <plugins>
             <plugin>

Added: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/.options
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/.options?rev=773681&view=auto
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/.options (added)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/.options Mon May 11 20:41:57 2009
@@ -0,0 +1 @@
+org.apache.openjpa.eclipse/debug=true

Added: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/META-INF/MANIFEST.MF?rev=773681&view=auto
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/META-INF/MANIFEST.MF (added)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/META-INF/MANIFEST.MF Mon May 11 20:41:57 2009
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apache OpenJPA Enhancer Plug-in
+Bundle-SymbolicName: org.apache.openjpa.eclipse;singleton:=true
+Bundle-Version: 2.0.0
+Bundle-Activator: org.apache.openjpa.eclispe.Activator
+Bundle-Vendor: Apache.org
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.jst.common.frameworks
+Bundle-ActivationPolicy: lazy
+Export-Package: 
+Import-Package: junit.framework;version="3.8.1"

Propchange: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/about.ini
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/about.ini?rev=773681&view=auto
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/about.ini (added)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/about.ini Mon May 11 20:41:57 2009
@@ -0,0 +1,39 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Rev: 583586 $ $Date: 2007-10-10 15:29:32 -0400 (Wed, 10 Oct 2007) $
+#
+
+#
+# Property "aboutText" contains blurb for feature details in the "About" 
+# dialog.  Maximum 15 lines and 75 characters per line.
+#
+aboutText=Apache OpenJPA Plugin\n\
+Version: ${pom.version}-${buildNumber}\n\
+\n\
+(c) Copyright 2009 The Apache Software Foundation\n\
+Visit http://www.apache.org/licenses/LICENSE-2.0.txt for additional details\n\
+\n\
+Visit http://openjpa.apache.org/\n\
+\n\
+This product includes software developed by the\n\
+Apache Software Foundation http://www.apache.org/
+
+#
+# Property "featureImage" contains path to feature image (32x32)
+#
+#featureImage=logo-32x32.gif
+

Added: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.properties
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.properties?rev=773681&view=auto
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.properties (added)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.properties Mon May 11 20:41:57 2009
@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# $Rev: 583586 $ $Date: 2007-10-10 15:29:32 -0400 (Wed, 10 Oct 2007) $
+#
+pluginName=Apache OpenJPA Plugin
+providerName=Apache Software Foundation
+

Propchange: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.xml?rev=773681&view=auto
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.xml (added)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/plugin.xml Mon May 11 20:41:57 2009
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.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.
+  -->
+
+<!-- $Rev: 589873 $ $Date: 2007-10-29 17:48:35 -0400 (Mon, 29 Oct 2007) $ -->
+
+<plugin>
+
+</plugin>
+

Added: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/pom.xml?rev=773681&view=auto
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/pom.xml (added)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/pom.xml Mon May 11 20:41:57 2009
@@ -0,0 +1,121 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- $Rev: 609739 $ $Date: 2008-01-07 13:54:14 -0500 (Mon, 07 Jan 2008) $ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.openjpa.openjpa-eclipse-plugin</groupId>
+        <artifactId>plugins-parent</artifactId>
+        <version>2.0.0</version>
+    </parent>
+
+    <groupId>org.apache.openjpa.openjpa-eclipse-plugin</groupId>
+    <artifactId>org.apache.openjpa.eclipse</artifactId>
+    <packaging>jar</packaging>
+    <name>${artifactId}</name>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>..</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>about.html</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>.</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>plugin.xml</include>
+                    <include>plugin.properties</include>
+                    <include>.options</include>
+                    <include>about.ini</include>
+                </includes>
+            </resource>
+            <!--
+                Ensure filtering is not used on a binary resource 
+                as it may get inadvertently altered
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>logo-32x32.gif</include>
+                </includes>
+            </resource>
+            -->
+            <!-- The put license and notice for artifacts shipped in this jar 
+                 in the jar's meta-inf directory -->
+            <resource>
+                <targetPath>META-INF</targetPath>
+                <directory>.</directory>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+	    <!-- Display license and notice in Eclipse Update Manager 
+                 See also http://www.eclipse.org/legal/guidetolegaldoc.php
+                 about.html references about_files to show licenses and notices
+                 to the user at install time using Eclipse Update Manager, and
+                  after install.
+            -->
+            <resource>
+	    	<targetPath>about_files</targetPath>
+	    	<directory>.</directory>
+	    	<includes>
+	    	    <include>LICENSE.txt</include>
+	    	    <include>NOTICE.txt</include>
+	    	</includes>
+            </resource>
+            <resource>
+	    	<targetPath>about_files</targetPath>
+	    	<directory>../..</directory>
+                <filtering>true</filtering>
+	    	<includes>
+                    <include>PLUGIN_RELEASE-NOTES-${pom.version}.txt</include>
+	    	</includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.devtools</groupId>
+                <artifactId>maven-eclipsepde-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+           <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openjpa.openjpa-eclipse-plugin</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>${version}</version>
+            <type>pom</type>
+        </dependency>
+    </dependencies>
+</project>

Propchange: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/org.apache.openjpa.eclipse/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: openjpa/sandboxes/openjpa-eclipse-plugin/plugins/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/plugins/pom.xml?rev=773681&r1=773680&r2=773681&view=diff
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/plugins/pom.xml (original)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/plugins/pom.xml Mon May 11 20:41:57 2009
@@ -18,15 +18,18 @@
 <!-- $Rev: 702573 $ $Date: 2008-10-07 14:20:43 -0400 (Tue, 07 Oct 2008) $ -->
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openjpa.openjpa-eclipse-plugin</groupId>
-    <artifactId>plugins-parent</artifactId>
-    <packaging>pom</packaging>
-    <name>OpenJPA Eclipse Plugin :: Plugins</name>
+
     <parent>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa-eclipse-plugin</artifactId>
         <version>2.0.0</version>
     </parent>
+
+    <groupId>org.apache.openjpa.openjpa-eclipse-plugin</groupId>
+    <artifactId>plugins-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>OpenJPA Eclipse Plugin :: Plugins</name>
+
     <build>
         <plugins>
             <plugin>

Modified: openjpa/sandboxes/openjpa-eclipse-plugin/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/openjpa-eclipse-plugin/pom.xml?rev=773681&r1=773680&r2=773681&view=diff
==============================================================================
--- openjpa/sandboxes/openjpa-eclipse-plugin/pom.xml (original)
+++ openjpa/sandboxes/openjpa-eclipse-plugin/pom.xml Mon May 11 20:41:57 2009
@@ -19,11 +19,6 @@
 <project>
                         
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.openjpa</groupId>
-    <artifactId>openjpa-eclipse-plugin</artifactId>
-    <packaging>pom</packaging>
-    <name>OpenJPA Eclipse Plugin</name>
-    <version>2.0.0</version>
                         
     <parent>
         <groupId>org.apache.openjpa</groupId>
@@ -31,6 +26,12 @@
         <version>2.0.0-SNAPSHOT</version>
     </parent>
                         
+    <groupId>org.apache.openjpa</groupId>
+    <artifactId>openjpa-eclipse-plugin</artifactId>
+    <version>2.0.0</version>
+    <packaging>pom</packaging>
+
+    <name>OpenJPA Eclipse Plugin</name>
     <description>Apache OpenJPA Eclipse Plugin</description>
     <url>http://openjpa.apache.org/</url>
                         
@@ -49,6 +50,7 @@
         <openjpaVersion>2.0.0-SNAPSHOT</openjpaVersion>
 
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
+        <checkstyle.config.location>../checkstyle.xml</checkstyle.config.location>
     </properties>
                         
     <build>
@@ -167,8 +169,8 @@
             </activation>
             <modules>
                 <module>eclipse</module>
-                <!-- 
                 <module>plugins</module>
+                <!-- 
                 <module>features</module>
                 <module>assembly</module>
                 -->