You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2007/06/08 04:44:37 UTC
svn commit: r545378 - in /geronimo/sandbox/j2g/plugins:
org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/
org.apache.geronimo.j2g.sources.environment/src/org/apache/geronimo/j2g/sources/environment/
Author: dwoods
Date: Thu Jun 7 19:44:36 2007
New Revision: 545378
URL: http://svn.apache.org/viewvc?view=rev&rev=545378
Log:
GERONIMO-3228 J2G Code must be updated to reflect recent property file move
Modified:
geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java
geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java?view=diff&rev=545378&r1=545377&r2=545378
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java Thu Jun 7 19:44:36 2007
@@ -18,6 +18,7 @@
package org.apache.geronimo.j2g.sources.dependence;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -62,11 +63,11 @@
* Tool output
*/
private IOutput out;
-
+
/**
* Property file with default Geronimo libraries names.
*/
- private final String DEFAULT_LIBS_FILENAME = "default_jars.properties";
+ private final String DEFAULT_LIBS_FILENAME = "../properties/org.apache.geronimo.j2g.sources.dependence/default_jars.properties";
/**
* Set of default Geronimo libraries names.
@@ -76,7 +77,7 @@
/**
* Compatibility sources names.
*/
- private final String COMPTIBILITY_SOURCES = "compatible_sources.properties";
+ private final String COMPATIBILITY_SOURCES = "../properties/org.apache.geronimo.j2g.sources.dependence/compatible_sources.properties";
/**
* Set of default Geronimo libraries names.
@@ -86,7 +87,7 @@
/**
* Property file with class analogies.
*/
- private final String CLASS_ANALOGIES_FILENAME = "class_analogies.properties";
+ private final String CLASS_ANALOGIES_FILENAME = "../properties/org.apache.geronimo.j2g.sources.dependence/class_analogies.properties";
/**
* Properties with class analogies.
@@ -116,8 +117,9 @@
super();
if (defaultLibs == null) {
try {
+ File propertyFile = new File(DEFAULT_LIBS_FILENAME);
Properties prop = new Properties();
- prop.load(DependenceJavaMigration.class.getResourceAsStream(DEFAULT_LIBS_FILENAME));
+ prop.load(new FileInputStream(propertyFile));
defaultLibs = prop.keySet();
} catch (IOException e) {
throw new FatalToolException("Cannot load properties file with default jars names.");
@@ -126,16 +128,18 @@
if (classAnalogies == null) {
try {
+ File propertyFile = new File(CLASS_ANALOGIES_FILENAME);
classAnalogies = new Properties();
- classAnalogies.load(DependenceJavaMigration.class.getResourceAsStream(CLASS_ANALOGIES_FILENAME));
+ classAnalogies.load(new FileInputStream(propertyFile));
} catch (IOException e) {
throw new FatalToolException("Cannot load properties file with class analogies.");
}
}
if (compatibilitySources == null) {
try {
+ File propertyFile = new File(COMPATIBILITY_SOURCES);
compatibilitySources = new Properties();
- compatibilitySources.load(DependenceJavaMigration.class.getResourceAsStream(COMPTIBILITY_SOURCES));
+ compatibilitySources.load(new FileInputStream(COMPATIBILITY_SOURCES));
} catch (IOException e) {
throw new FatalToolException("Cannot load properties file with compatibility classnames.");
}
@@ -256,4 +260,4 @@
public static Set getDefaultLibs() {
return defaultLibs;
}
-}
\ No newline at end of file
+}
Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java?view=diff&rev=545378&r1=545377&r2=545378
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java Thu Jun 7 19:44:36 2007
@@ -48,16 +48,16 @@
private static int counter = 0;
/** Property file with EJB interfaces */
- public final static String INTEFACES_PROP = "beans-interfaces.properties";
+ public final static String INTEFACES_PROP = "../properites/org.apache.geronimo.j2g.sources.environment/beans-interfaces.properties";
/** Property file with paths for searching types in jboss.xml */
- public final static String BEANS_TYPES_PROP = "beans-types.properties";
+ public final static String BEANS_TYPES_PROP = "../properites/org.apache.geronimo.j2g.sources.environment/beans-types.properties";
/**
* Property file with paths for searching home and remote interfaces in
* ejb-jar.xml
*/
- public final static String BEANS_REFS_PROP = "beans-references.properties";
+ public final static String BEANS_REFS_PROP = "../properites/org.apache.geronimo.j2g.sources.environment/beans-references.properties";
/** References in ejb-jar.xml to be found */
private final static String[] EJB_REFS = { "ejb-ref", "ejb-local-ref",