geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r559912 - in /geronimo/sandbox/j2g: plugins/org.apache.geronimo.j2g.descriptors/ plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/ plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2...
Date Thu, 26 Jul 2007 18:05:33 GMT
Author: sppatel
Date: Thu Jul 26 11:05:30 2007
New Revision: 559912

URL: http://svn.apache.org/viewvc?view=rev&rev=559912
Log:
GERONIMO-3342

Modified:
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/pom.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/annotation/AnnotationConverter.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/pom.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.classpath
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.project
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/META-INF/MANIFEST.MF
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/plugin.xml
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/pom.xml
    geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.bat
    geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.sh

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/pom.xml?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/pom.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/pom.xml Thu Jul 26 11:05:30
2007
@@ -29,6 +29,28 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>
+	<resources>
+	    <resource>
+		<directory>../../src/main/resources/properties/org.apache.geronimo.j2g.descriptors.ejb</directory>
+		<targetPath>.</targetPath>
+		<includes>
+		    <include>persistence_differences.properties</include>
+		</includes>
+	    </resource>
+	    <resource>
+		<directory>../../src/main/resources/properties/org.apache.geronimo.j2g.descriptors.ejb.annotation</directory>
+		<targetPath>.</targetPath>
+		<includes>
+		    <include>annotation_differences.properties</include>
+		</includes>
+	    </resource>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>plugin.xml</include>
+                </includes>
+            </resource>
+	</resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.devtools</groupId>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/EJBDescriptorTool.java
Thu Jul 26 11:05:30 2007
@@ -62,7 +62,8 @@
     private SecurityElementProcessor securityElementProcessor;
         
     // location of the properties file used to extract the differences
-    private final String PROP_PERSISTENCE_FILE = "../properties/org.apache.geronimo.j2g.descriptors.ejb/persistence_differences.properties";
+    private final String PROP_PERSISTENCE_FILENAME = "persistence_differences.properties";
+    private final String PROP_PERSISTENCE_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.j2g.descriptors.ejb/";
   
 
     public EJBDescriptorTool() {
@@ -207,7 +208,8 @@
         HashMap<String, String> diffs = new HashMap<String, String>();
         Properties mappingProps = new Properties();
         try {
-            mappingProps.load(new FileInputStream( PROP_PERSISTENCE_FILE ));
+        	File propertyFile = new File(PROP_PERSISTENCE_DIRECTORY + PROP_PERSISTENCE_FILENAME);
+            mappingProps.load(new FileInputStream( propertyFile ));
             // fetch all keys from the properties file
             Enumeration keys = mappingProps.propertyNames();
             // for each key, store the analogous into the hashmap
@@ -217,7 +219,7 @@
                 diffs.put(key, value);
             }
         } catch(Exception e) {
-            out.error("Cannot find properties file: " + PROP_PERSISTENCE_FILE);
+            out.error("Cannot find properties file: " + PROP_PERSISTENCE_FILENAME);
         }
         return diffs;
     }

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/annotation/AnnotationConverter.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/annotation/AnnotationConverter.java?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/annotation/AnnotationConverter.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.descriptors/src/org/apache/geronimo/j2g/descriptors/ejb/annotation/AnnotationConverter.java
Thu Jul 26 11:05:30 2007
@@ -17,6 +17,7 @@
 
 package org.apache.geronimo.j2g.descriptors.ejb.annotation;
 
+import java.io.File;
 import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -41,7 +42,8 @@
     //          to Geronimo-supported attributes associated with the keyword (may be different)
     private HashMap<String, HashMap<String, String>> j2gAnnotationDifferences;
     // location of the properties file used to extract the differences
-    private final String PROP_ANNOTATION_FILE = "../properties/org.apache.geronimo.j2g.descriptors.ejb.annotation/annotation_differences.properties";
+    private final String PROP_ANNOTATION_FILENAME = "annotation_differences.properties";
+    private final String PROP_ANNOTATION_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.j2g.descriptors.ejb.annotation/";
 
     // annotations that MAY require further configuration by the user
     private final String[] ambiguousAnnotations = {"@Resource", "@MessageDriven"};
@@ -211,7 +213,8 @@
         //  populate the hashmap with info from the properties file
         Properties mappingProps = new Properties();
         try {
-            mappingProps.load(new FileInputStream( PROP_ANNOTATION_FILE ));
+        	File propertyFile = new File(PROP_ANNOTATION_DIRECTORY + PROP_ANNOTATION_FILENAME);
   	
+            mappingProps.load(new FileInputStream( propertyFile ));
             // fetch all keys from the properties file
             Enumeration keys = mappingProps.propertyNames();
             // for each key (which is an annotation), store the differences into the hashmap
@@ -235,8 +238,8 @@
                 j2gAnnotationDifferences.put(key, diffs);
             }
         } catch(Exception e) {
-            log.error("Cannot find properties file: " + PROP_ANNOTATION_FILE);
-            System.out.println("Cannot find properties file: " + PROP_ANNOTATION_FILE);
+            log.error("Cannot find properties file: " + PROP_ANNOTATION_FILENAME);
+            System.out.println("Cannot find properties file: " + PROP_ANNOTATION_FILENAME);
         }
     }
 }

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/pom.xml?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/pom.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/pom.xml Thu Jul 26 11:05:30
2007
@@ -43,6 +43,24 @@
 					<include>*.jar</include>
 				</includes>
 			</resource>
+	    	    <resource>
+                        <directory>../../src/main/resources/properties/org.apache.geronimo.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.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/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java
Thu Jul 26 11:05:30 2007
@@ -68,7 +68,8 @@
 	/**
 	 * Property file with default Geronimo libraries names.
 	 */
-	private final String DEFAULT_LIBS_FILENAME = "../properties/org.apache.geronimo.j2g.sources.dependence/default_jars.properties";
+	private final String DEFAULT_LIBS_FILENAME = "default_jars.properties";
+	private final String DEFAULT_LIBS_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.j2g.sources.dependence/";
 
 	/**
 	 * Set of default Geronimo libraries names.
@@ -78,7 +79,8 @@
 	/**
 	 * Compatibility sources names.
 	 */
-	private final String COMPATIBILITY_SOURCES = "../properties/org.apache.geronimo.j2g.sources.dependence/compatible_sources.properties";
+	private final String COMPATIBILITY_SOURCES_FILENAME = "compatible_sources.properties";
+	private final String COMPATIBILITY_SOURCES_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.j2g.sources.dependence/";
 
 	/**
 	 * Set of default Geronimo libraries names.
@@ -88,7 +90,8 @@
 	/**
 	 * Property file with class analogies.
 	 */
-	private final String CLASS_ANALOGIES_FILENAME = "../properties/org.apache.geronimo.j2g.sources.dependence/class_analogies.properties";
+	private final String CLASS_ANALOGIES_FILENAME = "class_analogies.properties";
+	private final String CLASS_ANALOGIES_DIRECTORY = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.j2g.sources.dependence/";
 
 	/**
 	 * Properties with class analogies.
@@ -103,7 +106,7 @@
 	/**
 	 * Location of Compatibles Files.
 	 */
-	private static final String COMPATIBLES_LOCATION = "../compatibility/org.apache.geronimo.j2g.sources.dependence.compatibility";
+	private static final String COMPATIBLES_LOCATION = System.getenv("ECLIPSE_HOME")+"/plugins/org.apache.geronimo.j2g.sources.dependence.compatibility";
 	/**
 	 * Java resources extension.
 	 */
@@ -122,7 +125,7 @@
 		super();
 		if (defaultLibs == null) {
 			try {
-				File propertyFile = new File(DEFAULT_LIBS_FILENAME);
+				File propertyFile = new File(DEFAULT_LIBS_DIRECTORY + DEFAULT_LIBS_FILENAME);
 				Properties prop = new Properties();
 				prop.load(new FileInputStream(propertyFile));
 				defaultLibs = prop.keySet();
@@ -133,7 +136,7 @@
 
 		if (classAnalogies == null) {
 			try {
-				File propertyFile = new File(CLASS_ANALOGIES_FILENAME);
+				File propertyFile = new File(CLASS_ANALOGIES_DIRECTORY + CLASS_ANALOGIES_FILENAME);
 				classAnalogies = new Properties();
 				classAnalogies.load(new FileInputStream(propertyFile));
 			} catch (IOException e) {
@@ -142,13 +145,12 @@
 		}
 		if (compatibilitySources == null) {
 			try {
-				File propertyFile = new File(COMPATIBILITY_SOURCES);
+				File propertyFile = new File(COMPATIBILITY_SOURCES_DIRECTORY + COMPATIBILITY_SOURCES_FILENAME);
 				compatibilitySources = new Properties();
-				compatibilitySources.load(new FileInputStream(COMPATIBILITY_SOURCES));
+				compatibilitySources.load(new FileInputStream(propertyFile));
 			} catch (IOException e) {
 				throw new FatalToolException("Cannot load properties file with compatibility classnames.");
 			}
-
 		}
 	}
 
@@ -205,8 +207,8 @@
 							File addedSource = new File(pack, sourceName);
 							addedSource.createNewFile();
 							PrintWriter writer = new PrintWriter(new FileOutputStream(addedSource));
-							InputStream inStream = new FileInputStream(new File(sourceDir,sourceName));
-
+							InputStream inStream = null;
+							inStream = new FileInputStream(new File(sourceDir,sourceName));
 							byte[] buffer = new byte[BUFFER_SIZE];
 							int len = 0;
 							while ((len = inStream.read(buffer)) > 0) {

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources/src/org/apache/geronimo/j2g/sources/environment/AbsoluteNameSolver.java
Thu Jul 26 11:05:30 2007
@@ -49,16 +49,19 @@
 	private static int counter = 0;
 
 	/** Property file with EJB interfaces */
-	public final static String INTEFACES_PROP = "../properties/org.apache.geronimo.j2g.sources.environment/beans-interfaces.properties";
+	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.j2g.sources.environment/";
 
 	/** Property file with paths for searching types in jboss.xml */
-	public final static String BEANS_TYPES_PROP = "../properties/org.apache.geronimo.j2g.sources.environment/beans-types.properties";
+	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.j2g.sources.environment/";
 
 	/**
 	 * Property file with paths for searching home and remote interfaces in
 	 * ejb-jar.xml
 	 */
-	public final static String BEANS_REFS_PROP = "../properties/org.apache.geronimo.j2g.sources.environment/beans-references.properties";
+	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.j2g.sources.environment/";
 
 	/** References in ejb-jar.xml to be found */
 	private final static String[] EJB_REFS = { "ejb-ref", "ejb-local-ref",
@@ -431,13 +434,11 @@
 		if (interfaces == null) {
 			interfaces = new Properties();
 			try {
-				File temp = new File(INTEFACES_PROP);
-				System.out.println("I think I'm here " + temp.getAbsolutePath());
-				File propertyFile = new File(INTEFACES_PROP);
+				File propertyFile = new File(INTERFACES_PROP_DIRECTORY + INTERFACES_PROP_FILENAME);
 				interfaces.load(new FileInputStream(propertyFile));
 			} catch (IOException ex) {
 				throw new NameSolvingException(
-						"Cannot read system property file: " + INTEFACES_PROP,
+						"Cannot read system property file: " + INTERFACES_PROP_FILENAME,
 						ex);
 			}
 		}
@@ -445,11 +446,11 @@
 		if (beansTypes == null) {
 			beansTypes = new Properties();
 			try {
-				File propertyFile = new File(BEANS_TYPES_PROP);
+				File propertyFile = new File(BEANS_TYPES_PROP_DIRECTORY + BEANS_TYPES_PROP_FILENAME);
 				beansTypes.load(new FileInputStream(propertyFile));
 			} catch (IOException ex) {
 				throw new NameSolvingException(
-						"Cannot read system property file: " + BEANS_TYPES_PROP,
+						"Cannot read system property file: " + BEANS_TYPES_PROP_FILENAME,
 						ex);
 			}
 		}
@@ -457,11 +458,11 @@
 		if (beansRefs == null) {
 			beansRefs = new Properties();
 			try {
-				File propertyFile = new File(BEANS_REFS_PROP);
+				File propertyFile = new File(BEANS_REFS_PROP_DIRECTORY + BEANS_REFS_PROP_FILENAME);
 				beansRefs.load(new FileInputStream(propertyFile));
 			} catch (IOException ex) {
 				throw new NameSolvingException(
-						"Cannot read system property file: " + BEANS_REFS_PROP,
+						"Cannot read system property file: " + BEANS_REFS_PROP_FILENAME,
 						ex);
 			}
 		}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.classpath
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.classpath?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.classpath (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.classpath Thu Jul 26 11:05:30
2007
@@ -1,24 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>
-  <classpathentry kind="src" path="lib" including="*.jar" excluding="**/*.java"/>
-  <classpathentry kind="src" path="src"/>
-  <classpathentry kind="src" path="test" output="target/test-classes"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="var" path="M2_REPO/pull-parser/pull-parser/2.1.10/pull-parser-2.1.10.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/junit/junit/4.3.1/junit-4.3.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
-  <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
-  <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xom/xom/1.0/xom-1.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1/jaxen-1.1.jar"/>
-</classpath>
\ No newline at end of file
+	<classpathentry excluding="**/*.java" including="plugin.xml" kind="src" path=""/>
+	<classpathentry excluding="**/*.java" including="*.jar" kind="src" path="lib"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" output="target/test-classes" path="test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/pull-parser/pull-parser/2.1.10/pull-parser-2.1.10.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/junit/junit/4.3.1/junit-4.3.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+	<classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+	<classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/xom/xom/1.0/xom-1.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
+	<classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+	<classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1/jaxen-1.1.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.project
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.project?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.project (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.project Thu Jul 26 11:05:30
2007
@@ -1,29 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>org.apache.geronimo.j2g.util</name>
-  <comment>JBoss to Geronimo Conversion Tool</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.pde.ManifestBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.pde.SchemaBuilder</name>
-    </buildCommand>
-    <buildCommand>
-      <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-      <arguments>
-        <dictionary>
-          <key>LaunchConfigHandle</key>
-          <value>&lt;project&gt;/.externalToolBuilders/Maven_Ant_Builder.launch</value>
-        </dictionary>
-      </arguments>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.pde.PluginNature</nature>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
+	<name>org.apache.geronimo.j2g.util</name>
+	<comment>JBoss to Geronimo Conversion Tool</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Maven_Ant_Builder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/META-INF/MANIFEST.MF?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/META-INF/MANIFEST.MF (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/META-INF/MANIFEST.MF Thu Jul
26 11:05:30 2007
@@ -4,7 +4,20 @@
 Bundle-SymbolicName: org.apache.geronimo.j2g.util;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Vendor: Apache.org
-Require-Bundle: org.eclipse.core.runtime
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
+ org.eclipse.jface;visibility:=reexport,
+ org.eclipse.debug.ui,
+ org.eclipse.core.resources,
+ org.eclipse.core.variables,
+ org.eclipse.core.expressions,
+ org.eclipse.core.filesystem,
+ org.eclipse.jdt.core,
+ org.eclipse.jdt.debug,
+ org.eclipse.jdt.junit,
+ org.eclipse.jdt.launching,
+ org.eclipse.debug.core,
+ org.eclipse.ui.console
 Bundle-ClassPath: .,
  lib/commons-logging-1.1.jar,
  lib/dom4j-1.6.1.jar,
@@ -72,4 +85,7 @@
  org.junit.runner.notification,
  org.junit.runners,
  org.w3c.dom
+Bundle-Activator: org.apache.geronimo.j2g.util.ui.Activator
+Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/plugin.xml?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/plugin.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/plugin.xml Thu Jul 26 11:05:30
2007
@@ -17,4 +17,38 @@
   ~ limitations under the License.
   -->
 <plugin>
+<extension point="org.eclipse.ui.popupMenus">
+		<viewerContribution
+		id="org.apache.geronimo.j2g.util.ui.popup.navigator"
+		targetID="org.eclipse.ui.views.ResourceNavigator">
+		<menu
+			id="org.apache.geronimo.j2g.util.ui.navigator.subMenu"
+			label="J2G Migration"
+			path="additions">
+			<separator name="group1"/>
+		</menu>
+		<action
+			id="org.apache.geronimo.j2g.util.ui.navigator.action1"
+			label="3. Resource Migration Tool (jres2g)"
+			helpContextId="org.apache.geronimo.j2g.util.ui.navigator.action1"
+			menubarPath="org.apache.geronimo.j2g.util.ui.navigator.subMenu/group1"
+			class="org.apache.geronimo.j2g.util.ui.Jres2gLauncher">
+		</action>
+		<action
+			id="org.apache.geronimo.j2g.util.ui.navigator.action3"
+			label="2. Descriptors Conversion Tool (jdes2g)"
+			helpContextId="org.apache.geronimo.j2g.util.ui.navigator.action3"
+			menubarPath="org.apache.geronimo.j2g.util.ui.navigator.subMenu/group1"
+			class="org.apache.geronimo.j2g.util.ui.Jdes2gLauncher">
+		</action>
+		<action
+			id="org.apache.geronimo.j2g.util.ui.navigator.action2"
+			label="1. Source Identification Tool (jsrc2g)"
+			helpContextId="org.apache.geronimo.j2g.util.ui.navigator.action2"
+			menubarPath="org.apache.geronimo.j2g.util.ui.navigator.subMenu/group1"
+			class="org.apache.geronimo.j2g.util.ui.Jsrc2gLauncher">
+		</action>
+	</viewerContribution>
+</extension>
 </plugin>
+

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/pom.xml?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/pom.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/pom.xml Thu Jul 26 11:05:30
2007
@@ -46,6 +46,16 @@
         </resources>
         <plugins>
             <plugin>
+                <groupId>org.apache.geronimo.devtools</groupId>
+                <artifactId>maven-eclipsepde-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>

Modified: geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.bat
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.bat?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.bat (original)
+++ geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.bat Thu Jul 26 11:05:30 2007
@@ -44,7 +44,10 @@
 ECHO.
 ECHO Copying J2G plugins to %ECLIPSE_HOME%\plugins\ ...
 ECHO.
-COPY /Y ..\plugins\*.jar %ECLIPSE_HOME%\plugins\
+XCOPY /Y ..\plugins\*.jar %ECLIPSE_HOME%\plugins\
+XCOPY /Y /E ..\properties\* %ECLIPSE_HOME%\plugins\
+XCOPY /Y /E ..\compatibility\* %ECLIPSE_HOME%\plugins\
+
 ECHO.
 java -cp ..\lib\configurator-1.0.0-SNAPSHOT.jar org.apache.geronimo.j2g.Configurator %ECLIPSE_HOME%
 

Modified: geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.sh?view=diff&rev=559912&r1=559911&r2=559912
==============================================================================
--- geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.sh (original)
+++ geronimo/sandbox/j2g/src/main/resources/bin/j2g-configure.sh Thu Jul 26 11:05:30 2007
@@ -33,6 +33,8 @@
 echo "Copying J2G plugins to $ECLIPSE_HOME/plugins/ ..."
 echo ""
 cp -vf ../plugins/*.jar $ECLIPSE_HOME/plugins/
+cp -vfr ../properties/* $ECLIPSE_HOME/plugins/
+cp -vfr ../compatibility/* $ECLIPSE_HOME/plugins/
 echo ""
 java -cp ../lib/configurator-1.0.0-SNAPSHOT.jar org.apache.geronimo.j2g.Configurator $ECLIPSE_HOME
 



Mime
View raw message