You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2007/10/19 22:32:55 UTC

svn commit: r586598 [2/2] - in /geronimo/devtools/j2g/trunk: ./ assembly/ assembly/src/ assembly/src/main/ assembly/src/main/assembly/ features/ features/org.apache.geronimo.devtools.j2g.feature.v1.0.0/ plugins/ plugins/org.apache.geronimo.devtools.j2g...

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.descriptors.ejb/persistence_differences.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.descriptors.ejb/persistence_differences.properties?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.descriptors.ejb/persistence_differences.properties (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.descriptors.ejb/persistence_differences.properties Fri Oct 19 13:32:52 2007
@@ -0,0 +1,24 @@
+#
+#  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.
+#
+###########################################################################
+# Jboss persistence.xml property names and its analogies.
+###########################################################################
+hibernate.connection.url = openjpa.ConnectionURL
+hibernate.connection.driver_class = openjpa.ConnectionDriverName
+hibernate.connection.password = openjpa.ConnectionPassword
+hibernate.connection.username = openjpa.ConnectionUserName
+hibernate.hbm2ddl.auto = suggestion:openjpa.jdbc.SynchronizeMappings

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.descriptors.ejb/persistence_differences.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/class_analogies.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/class_analogies.properties?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/class_analogies.properties (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/class_analogies.properties Fri Oct 19 13:32:52 2007
@@ -0,0 +1,25 @@
+#
+#  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.
+#
+###########################################################################################################
+# Jboss classes and it's analogies. 
+###########################################################################################################
+org.jboss.security.SimplePrincipal = org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal
+org.jboss.security.auth.spi.DigestCallback = org.apache.geronimo.j2g.sources.dependence.compatibility.DigestCallback
+org.jboss.security.Nobody = org.apache.geronimo.j2g.sources.dependence.compatibility.Nobody
+org.jboss.security.Anybody = org.apache.geronimo.j2g.sources.dependence.compatibility.Anybody
+org.jboss.security.auth.spi.UsernamePasswordLoginModule = org.apache.geronimo.j2g.sources.dependence.compatibility.GeronimoLoginModule
+org.jboss.security.SimpleGroup = org.apache.geronimo.j2g.sources.dependence.compatibility.GeronimoSimpleGroup

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/class_analogies.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/compatible_sources.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/compatible_sources.properties?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/compatible_sources.properties (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/compatible_sources.properties Fri Oct 19 13:32:52 2007
@@ -0,0 +1,25 @@
+#
+#  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.
+#
+######################################################################
+# List of compatibility sources 
+######################################################################
+org.apache.geronimo.j2g.sources.dependence.compatibility.DigestCallback
+org.apache.geronimo.j2g.sources.dependence.compatibility.Nobody
+org.apache.geronimo.j2g.sources.dependence.compatibility.Anybody
+org.apache.geronimo.j2g.sources.dependence.compatibility.GeronimoLoginModule
+org.apache.geronimo.j2g.sources.dependence.compatibility.GeronimoSimpleGroup
+org.apache.geronimo.j2g.sources.dependence.compatibility.PasswordHasher

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/compatible_sources.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/default_jars.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/default_jars.properties?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/default_jars.properties (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/default_jars.properties Fri Oct 19 13:32:52 2007
@@ -0,0 +1,35 @@
+#
+#  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.
+#
+######################################################################
+# List of default libraries for Geronimo AS. 
+######################################################################
+org/apache/geronimo/specs/geronimo-activation_1.0.2_spec/1.1/jar
+org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-j2ee-deployment_1.1_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-j2ee-jacc_1.0_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-j2ee-management_1.0_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-javamail_1.3.1_spec/1.1/jar
+org/apache/geronimo/specs/geronimo-jaxr_1.0_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-jaxrpc_1.1_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-jms_1.1_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-qname_1.1_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-saaj_1.1_spec/1.0.1/jar
+org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0.1/jar
+tomcat/jasper-runtime/5.5.15/jar

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/default_jars.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-interfaces.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-interfaces.properties?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-interfaces.properties (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-interfaces.properties Fri Oct 19 13:32:52 2007
@@ -0,0 +1,18 @@
+#
+#  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.
+#
+javax.ejb.SessionBean = /ejb-jar/enterprise-beans/session
+javax.ejb.EntityBean = /ejb-jar/enterprise-beans/entity

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-interfaces.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-references.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-references.properties?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-references.properties (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-references.properties Fri Oct 19 13:32:52 2007
@@ -0,0 +1,27 @@
+#
+#  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.
+#
+entity-local-home = local-home
+entity-local = local
+
+entity-remote-home = home
+entity-remote = remote
+
+session-local-home = local-home
+session-local = local
+
+session-remote-home = home 
+session-remote = remote

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-references.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-types.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-types.properties?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-types.properties (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-types.properties Fri Oct 19 13:32:52 2007
@@ -0,0 +1,20 @@
+#
+#  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.
+#
+/jboss/enterprise-beans/entity/jndi-name = entity-remote
+/jboss/enterprise-beans/entity/local-jndi-name = entity-local
+/jboss/enterprise-beans/session/jndi-name = session-remote
+/jboss/enterprise-beans/session/local-jndi-name = session-local

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/beans-types.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/plugin.xml?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/plugin.xml (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/plugin.xml Fri Oct 19 13:32:52 2007
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<!--
+  ~ 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.
+  -->
+<plugin>
+</plugin>

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/pom.xml?rev=586598&view=auto
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/pom.xml (added)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/pom.xml Fri Oct 19 13:32:52 2007
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- $Rev: 561821 $ $Date: 2007-08-01 11:05:12 -0400 (Wed, 01 Aug 2007) $ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.devtools.j2g</groupId>
+        <artifactId>plugins</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.apache.geronimo.devtools.j2g.properties</artifactId>
+    <packaging>jar</packaging>
+    <name>${artifactId}</name>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>plugin.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>.</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE.txt</include>
+                    <include>NOTICE.txt</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>org.apache.geronimo.devtools.j2g.sources.dependence</directory>
+                <targetPath>./org.apache.geronimo.devtools.j2g.sources.dependenc</targetPath>
+                <includes>
+                    <include>class_analogies.properties</include>
+                    <include>compatible_sources.properties</include>
+                    <include>default_jars.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>org.apache.geronimo.devtools.j2g.sources.environment</directory>
+                <targetPath>./org.apache.geronimo.devtools.j2g.sources.environment</targetPath>
+                <includes>
+                    <include>beans-interfaces.properties</include>
+                    <include>beans-references.properties</include>
+                    <include>beans-types.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>org.apache.geronimo.devtools.j2g.descriptors.ejb</directory>
+                <targetPath>./org.apache.geronimo.devtools.j2g.descriptors.ejb</targetPath>
+                <includes>
+                    <include>persistence_differences.properties</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>org.apache.geronimo.devtools.j2g.descriptors.ejb.annotation</directory>
+                <targetPath>./org.apache.geronimo.devtools.j2g.descriptors.ejb.annotation</targetPath>
+                <includes>
+                    <include>annotation_differences.properties</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.properties/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/devtools/j2g/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/pom.xml?rev=586598&r1=586597&r2=586598&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/pom.xml Fri Oct 19 13:32:52 2007
@@ -104,5 +104,6 @@
         <module>org.apache.geronimo.devtools.j2g.sources</module>
         <module>org.apache.geronimo.devtools.j2g.util</module>
         <module>org.apache.geronimo.devtools.j2g.ui</module>
+        <module>org.apache.geronimo.devtools.j2g.properties</module>
     </modules>
 </project>

Modified: geronimo/devtools/j2g/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/pom.xml?rev=586598&r1=586597&r2=586598&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/pom.xml Fri Oct 19 13:32:52 2007
@@ -85,6 +85,7 @@
 
     <properties>
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
+        <org.apache.geronimo.devtools.j2g.feature_version>1.0.0-SNAPSHOT</org.apache.geronimo.devtools.j2g.feature_version>
         <maven.test.skip>false</maven.test.skip>
     </properties>
 
@@ -132,15 +133,6 @@
         </pluginManagement>
         <plugins>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <finalName>j2g-conversion-${version}</finalName>
-                    <descriptors>
-                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-            <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <source>1.5</source>
@@ -323,5 +315,7 @@
     <modules>
         <module>eclipse</module>
         <module>plugins</module>
+        <module>features</module>
+        <module>assembly</module>
     </modules>
 </project>

Modified: geronimo/devtools/j2g/trunk/readme.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/readme.txt?rev=586598&r1=586597&r2=586598&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/readme.txt (original)
+++ geronimo/devtools/j2g/trunk/readme.txt Fri Oct 19 13:32:52 2007
@@ -20,9 +20,12 @@
 
 To build invoke:
 
-mvn install assembly:assembly
+mvn install
 
-The binary assembly will be located in the target directory.
+The binary assembly will be located in the assembly/target directory.  
+-deployable zip file is for general j2g installation.
+-updatesite zip file is for copying over to the eclipse update site which enables a user to install J2G via Eclipse update manager.  
+Please note the J2G command line options aren't available if you choose to install it via Eclipse update manager.
 
 For additional building information, visit http://cwiki.apache.org/confluence/display/GMOxDOC11/J2G+Migration+Tool
 For usage information consult the documentation doc/readme.txt

Modified: geronimo/devtools/j2g/trunk/src/main/resources/bin/j2g-configure.bat
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/src/main/resources/bin/j2g-configure.bat?rev=586598&r1=586597&r2=586598&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/src/main/resources/bin/j2g-configure.bat (original)
+++ geronimo/devtools/j2g/trunk/src/main/resources/bin/j2g-configure.bat Fri Oct 19 13:32:52 2007
@@ -44,8 +44,8 @@
 ECHO.
 ECHO Copying J2G plugins to %ECLIPSE_HOME%\plugins\ ...
 ECHO.
-XCOPY /Y ..\plugins\*.jar %ECLIPSE_HOME%\plugins\
-XCOPY /Y /E ..\properties\* %ECLIPSE_HOME%\plugins\
+XCOPY /Y /E ..\plugins\* %ECLIPSE_HOME%\plugins\
+XCOPY /Y ..\features\*.jar %ECLIPSE_HOME%\features\
 
 :end
 @REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'

Modified: geronimo/devtools/j2g/trunk/src/main/resources/bin/j2g-configure.sh
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/src/main/resources/bin/j2g-configure.sh?rev=586598&r1=586597&r2=586598&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/src/main/resources/bin/j2g-configure.sh (original)
+++ geronimo/devtools/j2g/trunk/src/main/resources/bin/j2g-configure.sh Fri Oct 19 13:32:52 2007
@@ -32,6 +32,6 @@
 echo ""
 echo "Copying J2G plugins to $ECLIPSE_HOME/plugins/ ..."
 echo ""
-cp -vf ../plugins/*.jar $ECLIPSE_HOME/plugins/
-cp -vfr ../properties/* $ECLIPSE_HOME/plugins/
+cp -vf ../features/*.jar $ECLIPSE_HOME/features/
+cp -vfr ../plugins/* $ECLIPSE_HOME/plugins/