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/23 21:43:26 UTC
svn commit: r587632 - in /geronimo/devtools/j2g/trunk/plugins:
org.apache.geronimo.devtools.j2g.descriptors/
org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/
org.apache.geronimo.devtools.j2g.descriptors...
Author: linsun
Date: Tue Oct 23 12:43:25 2007
New Revision: 587632
URL: http://svn.apache.org/viewvc?rev=587632&view=rev
Log:
point to the right location of the properties files also no need to include properties file in the jar.
Modified:
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/EJBDescriptorTool.java
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/annotation/AnnotationConverter.java
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/dependence/DependenceJavaMigration.java
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/environment/AbsoluteNameSolver.java
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml?rev=587632&r1=587631&r2=587632&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml Tue Oct 23 12:43:25 2007
@@ -45,20 +45,6 @@
<include>plugin.xml</include>
</includes>
</resource>
- <resource>
- <directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.descriptors.ejb</directory>
- <targetPath>.</targetPath>
- <includes>
- <include>persistence_differences.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.descriptors.ejb.annotation</directory>
- <targetPath>.</targetPath>
- <includes>
- <include>annotation_differences.properties</include>
- </includes>
- </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/EJBDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/EJBDescriptorTool.java?rev=587632&r1=587631&r2=587632&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/EJBDescriptorTool.java (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/EJBDescriptorTool.java Tue Oct 23 12:43:25 2007
@@ -63,7 +63,7 @@
// location of the properties file used to extract the differences
private final String PROP_PERSISTENCE_FILENAME = "persistence_differences.properties";
- private final String PROP_PERSISTENCE_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.descriptors.ejb/";
+ private final String PROP_PERSISTENCE_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.descriptors.ejb/";
public EJBDescriptorTool() {
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/annotation/AnnotationConverter.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/annotation/AnnotationConverter.java?rev=587632&r1=587631&r2=587632&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/annotation/AnnotationConverter.java (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/src/org/apache/geronimo/devtools/j2g/descriptors/ejb/annotation/AnnotationConverter.java Tue Oct 23 12:43:25 2007
@@ -43,7 +43,7 @@
private HashMap<String, HashMap<String, String>> j2gAnnotationDifferences;
// location of the properties file used to extract the differences
private final String PROP_ANNOTATION_FILENAME = "annotation_differences.properties";
- private final String PROP_ANNOTATION_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.descriptors.ejb.annotation/";
+ private final String PROP_ANNOTATION_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.descriptors.ejb.annotation/";
// annotations that MAY require further configuration by the user
private final String[] ambiguousAnnotations = {"@Resource", "@MessageDriven"};
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml?rev=587632&r1=587631&r2=587632&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml Tue Oct 23 12:43:25 2007
@@ -51,24 +51,6 @@
<include>NOTICE.txt</include>
</includes>
</resource>
- <resource>
- <directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.sources.dependence</directory>
- <targetPath>.</targetPath>
- <includes>
- <include>class_analogies.properties</include>
- <include>compatible_sources.properties</include>
- <include>default_jars.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.sources.environment</directory>
- <targetPath>.</targetPath>
- <includes>
- <include>beans-interfaces.properties</include>
- <include>beans-references.properties</include>
- <include>beans-types.properties</include>
- </includes>
- </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/dependence/DependenceJavaMigration.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/dependence/DependenceJavaMigration.java?rev=587632&r1=587631&r2=587632&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/dependence/DependenceJavaMigration.java (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/dependence/DependenceJavaMigration.java Tue Oct 23 12:43:25 2007
@@ -68,7 +68,7 @@
* Property file with default Geronimo libraries names.
*/
private final String DEFAULT_LIBS_FILENAME = "default_jars.properties";
- private final String DEFAULT_LIBS_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.sources.dependence/";
+ private final String DEFAULT_LIBS_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/";
/**
* Set of default Geronimo libraries names.
@@ -79,7 +79,7 @@
* Compatibility sources names.
*/
private final String COMPATIBILITY_SOURCES_FILENAME = "compatible_sources.properties";
- private final String COMPATIBILITY_SOURCES_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.sources.dependence/";
+ private final String COMPATIBILITY_SOURCES_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/";
/**
* Set of default Geronimo libraries names.
@@ -90,7 +90,7 @@
* Property file with class analogies.
*/
private final String CLASS_ANALOGIES_FILENAME = "class_analogies.properties";
- private final String CLASS_ANALOGIES_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.sources.dependence/";
+ private final String CLASS_ANALOGIES_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.dependence/";
/**
* Properties with class analogies.
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/environment/AbsoluteNameSolver.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/environment/AbsoluteNameSolver.java?rev=587632&r1=587631&r2=587632&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/environment/AbsoluteNameSolver.java (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/src/org/apache/geronimo/devtools/j2g/sources/environment/AbsoluteNameSolver.java Tue Oct 23 12:43:25 2007
@@ -50,18 +50,18 @@
/** Property file with EJB interfaces */
public final static String INTERFACES_PROP_FILENAME = "beans-interfaces.properties";
- public final static String INTERFACES_PROP_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.sources.environment/";
+ public final static String INTERFACES_PROP_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/";
/** Property file with paths for searching types in jboss.xml */
public final static String BEANS_TYPES_PROP_FILENAME = "beans-types.properties";
- public final static String BEANS_TYPES_PROP_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.sources.environment/";
+ public final static String BEANS_TYPES_PROP_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/";
/**
* Property file with paths for searching home and remote interfaces in
* ejb-jar.xml
*/
public final static String BEANS_REFS_PROP_FILENAME = "beans-references.properties";
- public final static String BEANS_REFS_PROP_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.sources.environment/";
+ public final static String BEANS_REFS_PROP_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.devtools.j2g.properties/org.apache.geronimo.devtools.j2g.sources.environment/";
/** References in ejb-jar.xml to be found */
private final static String[] EJB_REFS = { "ejb-ref", "ejb-local-ref",