geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r560332 - in /geronimo/sandbox/j2g/plugins: ./ org.apache.geronimo.j2g.util/ org.apache.geronimo.j2g.util/META-INF/ org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/
Date Fri, 27 Jul 2007 17:39:25 GMT
Author: sppatel
Date: Fri Jul 27 10:39:24 2007
New Revision: 560332

URL: http://svn.apache.org/viewvc?view=rev&rev=560332
Log:
p3342

Modified:
    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/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Activator.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jdes2gLauncher.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jres2gLauncher.java
    geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jsrc2gLauncher.java
    geronimo/sandbox/j2g/plugins/pom.xml

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=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.classpath (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.classpath Fri Jul 27 10:39:24
2007
@@ -1,25 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<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>
+  <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

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=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.project (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/.project Fri Jul 27 10:39:24
2007
@@ -1,37 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<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>
+  <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

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=560332&r1=560331&r2=560332
==============================================================================
--- 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 Fri Jul
27 10:39:24 2007
@@ -4,20 +4,7 @@
 Bundle-SymbolicName: org.apache.geronimo.j2g.util;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Vendor: Apache.org
-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
+Require-Bundle: org.eclipse.core.runtime
 Bundle-ClassPath: .,
  lib/commons-logging-1.1.jar,
  lib/dom4j-1.6.1.jar,
@@ -85,7 +72,4 @@
  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=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/plugin.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/plugin.xml Fri Jul 27 10:39:24
2007
@@ -17,38 +17,4 @@
   ~ 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=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/pom.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/pom.xml Fri Jul 27 10:39:24
2007
@@ -46,16 +46,6 @@
         </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/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Activator.java?view=diff&rev=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Activator.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Activator.java
Fri Jul 27 10:39:24 2007
@@ -1,45 +0,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.
- */
-
-package org.apache.geronimo.j2g.util.ui;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-public class Activator extends AbstractUIPlugin {
-
-	public static final String PLUGIN_ID = "org.apache.geronimo.j2g.util.ui";
-	private static Activator plugin;
-
-	public Activator() {
-		Activator.plugin = this;
-	}
-
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		Activator.plugin = null;
-		super.stop(context);
-	}
-
-	public static Activator getDefault() {
-		return Activator.plugin;
-	}
-
-}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jdes2gLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jdes2gLauncher.java?view=diff&rev=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jdes2gLauncher.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jdes2gLauncher.java
Fri Jul 27 10:39:24 2007
@@ -1,165 +0,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.
- */
-
-package org.apache.geronimo.j2g.util.ui;
-
-import java.io.*;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.ui.console.*;
-
-public class Jdes2gLauncher
-	extends ActionDelegate
-	implements IViewActionDelegate 
-{
-
-	/**
-	 * Eclipse home.
-	 */
-	private String eclipseHomePath;
-	
-	/**
-	 * Eclipse workspace.
-	 */
-	private String eclipseWorkspacePath;
-	
-	/**
-	 * Geronimo Home.
-	 */
-	private String geronimoHome;
-	
-	/**
-	 * Source directory.
-	 */
-	private String sourceDir;
-	
-	/**
-	 * Web directory.
-	 */
-	private String webDir = "";
-
-
-	public void run(IAction action) {
-		MessageConsole console = new MessageConsole("System Output", null);
-		ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] { console });
-		ConsolePlugin.getDefault().getConsoleManager().showConsoleView(console);
-		MessageConsoleStream stream = console.newMessageStream();
-		System.setOut(new PrintStream(stream));
-		System.setErr(new PrintStream(stream));
-		String fdselected = new String();
-		MessageBox prompt = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.ICON_WARNING);
-		MessageBox yesNoBox = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.ICON_QUESTION|SWT.YES|SWT.NO);
-		DirectoryDialog fd = new DirectoryDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.OPEN);
-		String cmdOutput = null;
-		String[] cmd = new String[3];
-		
-		// Check environment for eclipse home
-		
-		eclipseHomePath = System.getenv("ECLIPSE_HOME");	
-		if (eclipseHomePath == null)
-		{
-			prompt.setMessage("'ECLIPSE_HOME' was not found in your environment.\n" +
-					"Please set it and relaunch Eclipse.");
-			prompt.open();
-			return;
-		}
-
-		//Check environment for Workspace dir.
-		
-		eclipseWorkspacePath = System.getenv("WORKSPACE");	
-		if (eclipseWorkspacePath == null)
-		{
-			prompt.setMessage("'WORKSPACE' was not found in your environment.\n" +
-					"Please select the location of your temporary Eclipse Workspace now.");
-			prompt.open();
-			fd.setMessage("Select Eclipse Workspace directory");
-			fd.setText("Select Eclipse Workspace directory");
-			fd.setFilterPath(System.getProperty("user.home"));	
-			fdselected = fd.open();
-			if (fdselected == null)
-				return;
-			eclipseWorkspacePath = fdselected;
-		}
-
-		//Select target directory
-		prompt.setMessage("Please select application root directory to convert.");
-		prompt.open();
-		fd.setMessage("Select application root directory");
-		fd.setText("Select application root directory");
-		fd.setFilterPath(System.getProperty("user.home"));	
-		sourceDir = fd.open();
-		if (sourceDir == null)
-			return;
-		yesNoBox.setMessage("Jdes2g is going to be executed on "+sourceDir+".\n"+
-			"This process may take a while, and cause Eclipse to appear unresponsive.\n"+
-				"Continue?");
-		if (SWT.NO == yesNoBox.open())
-		{
-			return;
-		}
-		
-		//Everything but windows uses this		
-		
-		if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1)
-		{
-			cmd[0] = "bash";
-			cmd[1] = "-c";
-		}
-		else	//This is just for windows
-		{
-			cmd[0] = "cmd";
-			cmd[1] = "/c";
-		}
-		cmd[2] = "java -classpath "+eclipseHomePath+System.getProperty("file.separator")+"plugins"+System.getProperty("file.separator")+"org.eclipse.equinox.launcher_*.jar
org.eclipse.equinox.launcher.Main -application org.apache.geronimo.j2g.descriptors.tool -data
"+eclipseWorkspacePath+" "+sourceDir;
-		
-		System.out.println("Executing: "+cmd[2]);
-		try {
-        Process cmdProcess = Runtime.getRuntime().exec(cmd);
-        
-        BufferedReader stdInput = new BufferedReader(new 
-             InputStreamReader(cmdProcess.getInputStream()));
-
-        BufferedReader stdError = new BufferedReader(new 
-             InputStreamReader(cmdProcess.getErrorStream()));
-        
-        while ((cmdOutput = stdInput.readLine()) != null) {
-            System.out.println(cmdOutput);
-        }
-
-        while ((cmdOutput = stdError.readLine()) != null) {
-            System.out.println(cmdOutput);
-        }
-    }
-
-    catch (IOException e) {
-        System.out.println("Error executing "+cmd[2]);
-        e.printStackTrace();
-    }
-	}
-
-	public void init(IViewPart view) {
-		
-	}
-
-}
-

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jres2gLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jres2gLauncher.java?view=diff&rev=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jres2gLauncher.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jres2gLauncher.java
Fri Jul 27 10:39:24 2007
@@ -1,164 +0,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.
- */
-
-package org.apache.geronimo.j2g.util.ui;
-
-import java.io.*;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.ui.console.*;
-
-public class Jres2gLauncher
-	extends ActionDelegate
-	implements IViewActionDelegate 
-{
-
-	/**
-	 * Eclipse home.
-	 */
-	private String eclipseHomePath;
-	
-	/**
-	 * Eclipse workspace.
-	 */
-	private String eclipseWorkspacePath;
-	
-	/**
-	 * Geronimo Home.
-	 */
-	private String geronimoHome;
-	
-	/**
-	 * Source directory.
-	 */
-	private String sourceDir;
-	
-	/**
-	 * Web directory.
-	 */
-	private String webDir = "";
-
-	public void run(IAction action) {
-		MessageConsole console = new MessageConsole("System Output", null);
-		ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] { console });
-		ConsolePlugin.getDefault().getConsoleManager().showConsoleView(console);
-		MessageConsoleStream stream = console.newMessageStream();
-		System.setOut(new PrintStream(stream));
-		System.setErr(new PrintStream(stream));
-		String fdselected = new String();
-		MessageBox prompt = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.ICON_WARNING);
-		MessageBox yesNoBox = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.ICON_QUESTION|SWT.YES|SWT.NO);
-		DirectoryDialog fd = new DirectoryDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.OPEN);
-		String cmdOutput = null;
-		String[] cmd = new String[3];
-		
-		// Check environment for eclipse home
-		
-		eclipseHomePath = System.getenv("ECLIPSE_HOME");	
-		if (eclipseHomePath == null)
-		{
-			prompt.setMessage("'ECLIPSE_HOME' was not found in your environment.\n" +
-					"Please set it and relaunch Eclipse.");
-			prompt.open();
-			return;
-		}
-
-		//Check environment for Workspace dir.
-		
-		eclipseWorkspacePath = System.getenv("WORKSPACE");	
-		if (eclipseWorkspacePath == null)
-		{
-			prompt.setMessage("'WORKSPACE' was not found in your environment.\n" +
-					"Please select the location of your temporary Eclipse Workspace now.");
-			prompt.open();
-			fd.setMessage("Select Eclipse Workspace directory");
-			fd.setText("Select Eclipse Workspace directory");
-			fd.setFilterPath(System.getProperty("user.home"));	
-			fdselected = fd.open();
-			if (fdselected == null)
-				return;
-			eclipseWorkspacePath = fdselected;
-		}
-		
-		//Select target directory
-		prompt.setMessage("Please select application root directory to convert.");
-		prompt.open();
-		fd.setMessage("Select application root directory");
-		fd.setText("Select application root directory");
-		fd.setFilterPath(System.getProperty("user.home"));	
-		sourceDir = fd.open();
-		if (sourceDir == null)
-				return;
-		yesNoBox.setMessage("Jres2g is going to be executed on "+sourceDir+".\n"+
-			"This process may take a while, and cause Eclipse to appear unresponsive.\n"+
-				"Continue?");
-		if (SWT.NO == yesNoBox.open())
-		{
-			return;
-		}
-		
-		//Everything but windows uses this		
-		
-		if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1)
-		{
-			cmd[0] = "bash";
-			cmd[1] = "-c";
-		}
-		else	//This is just for windows
-		{
-			cmd[0] = "cmd";
-			cmd[1] = "/c";
-		}
-		cmd[2] = "java -classpath "+eclipseHomePath+System.getProperty("file.separator")+"plugins"+System.getProperty("file.separator")+"org.eclipse.equinox.launcher_*.jar
org.eclipse.equinox.launcher.Main -application org.apache.geronimo.j2g.resources.tool -data
"+eclipseWorkspacePath+" "+sourceDir;
-		
-		System.out.println("Executing: "+cmd[2]);
-		try {
-        Process cmdProcess = Runtime.getRuntime().exec(cmd);
-        
-        BufferedReader stdInput = new BufferedReader(new 
-             InputStreamReader(cmdProcess.getInputStream()));
-
-        BufferedReader stdError = new BufferedReader(new 
-             InputStreamReader(cmdProcess.getErrorStream()));
-        
-        while ((cmdOutput = stdInput.readLine()) != null) {
-            System.out.println(cmdOutput);
-        }
-
-        while ((cmdOutput = stdError.readLine()) != null) {
-            System.out.println(cmdOutput);
-        }
-    }
-
-    catch (IOException e) {
-        System.out.println("Error executing "+cmd[2]);
-        e.printStackTrace();
-    }
-	}
-
-	public void init(IViewPart view) {
-		
-	}
-
-}
-

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jsrc2gLauncher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jsrc2gLauncher.java?view=diff&rev=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jsrc2gLauncher.java
(original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.util/src/org/apache/geronimo/j2g/util/ui/Jsrc2gLauncher.java
Fri Jul 27 10:39:24 2007
@@ -1,190 +0,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.
- */
-
-package org.apache.geronimo.j2g.util.ui;
-
-import java.io.*;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.ui.console.*;
-
-public class Jsrc2gLauncher
-	extends ActionDelegate
-	implements IViewActionDelegate 
-{
-
-	/**
-	 * Eclipse home.
-	 */
-	private String eclipseHomePath;
-	
-	/**
-	 * Eclipse workspace.
-	 */
-	private String eclipseWorkspacePath;
-	
-	/**
-	 * Geronimo Home.
-	 */
-	private String geronimoHome;
-	
-	/**
-	 * Source directory.
-	 */
-	private String sourceDir;
-	
-	/**
-	 * Web directory.
-	 */
-	private String webDir = "";
-
-	public void run(IAction action) {
-		MessageConsole console = new MessageConsole("System Output", null);
-		ConsolePlugin.getDefault().getConsoleManager().addConsoles(new IConsole[] { console });
-		ConsolePlugin.getDefault().getConsoleManager().showConsoleView(console);
-		MessageConsoleStream stream = console.newMessageStream();
-		System.setOut(new PrintStream(stream));
-		System.setErr(new PrintStream(stream));
-		String fdselected = new String();
-		MessageBox prompt = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.ICON_WARNING);
-		MessageBox yesNoBox = new MessageBox(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.ICON_QUESTION|SWT.YES|SWT.NO);
-		DirectoryDialog fd = new DirectoryDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.OPEN);
-		String cmdOutput = null;
-		String[] cmd = new String[3];
-		
-		// Check environment for eclipse home
-		
-		eclipseHomePath = System.getenv("ECLIPSE_HOME");	
-		if (eclipseHomePath == null)
-		{
-			prompt.setMessage("'ECLIPSE_HOME' was not found in your environment.\n" +
-					"Please select the location of your Eclipse SDK now.");
-			prompt.open();
-			fd.setMessage("Select Eclipse SDK directory");
-			fd.setText("Select Eclipse SDK directory");
-			fd.setFilterPath(System.getProperty("user.home"));	
-			fdselected = fd.open();
-			if (fdselected == null)
-				return;
-			eclipseHomePath = fdselected;
-		}
-		
-		//Check environment for Workspace dir.		
-
-		eclipseHomePath = System.getenv("ECLIPSE_HOME");	
-		if (eclipseHomePath == null)
-		{
-			prompt.setMessage("'ECLIPSE_HOME' was not found in your environment.\n" +
-					"Please set it and relaunch Eclipse.");
-			prompt.open();
-			return;
-		}
-		
-		//Check environment for Geronimo Home		
-			
-		geronimoHome = System.getenv("GERONIMO_HOME");	
-		if (geronimoHome == null)
-		{
-			prompt.setMessage("'GERONIMO_HOME' was not found in your environment.\n" +
-					"Please select the location of Geronimo now.");
-			prompt.open();
-			fd.setMessage("Select Geronimo directory");
-			fd.setText("Select Geronimo directory");
-			fd.setFilterPath(System.getProperty("user.home"));	
-			fdselected = fd.open();
-			if (fdselected == null)
-				return;
-			geronimoHome = fdselected;
-		}
-		
-		//Select target directories
-		prompt.setMessage("Please select application source directory to convert.");
-		prompt.open();
-		fd.setMessage("Select application source directory");
-		fd.setText("Select application source directory");
-		fd.setFilterPath(System.getProperty("user.home"));	
-		sourceDir = fd.open();
-		if (sourceDir == null)
-			return;
-		yesNoBox.setMessage("Do you wish to convert web (JSP) sources as well?");
-		if (SWT.YES == yesNoBox.open())
-		{
-			webDir = " -web ";
-			fd.setMessage("Select web (JSP) source directory");
-			fd.setText("Select web (JSP) source directory");
-			fd.setFilterPath(System.getProperty("user.home"));	
-			webDir = webDir+fd.open();
-		}
-		yesNoBox.setMessage("Jsrc2g is going to be executed with -src "+sourceDir+webDir+".\n"+
-			"This process may take a while, and cause Eclipse to appear unresponsive.\n"+
-				"Continue?");
-		if (SWT.NO == yesNoBox.open())
-		{
-			return;
-		}
-		
-		//Everything but windows uses this		
-		
-		if (System.getProperty("os.name").toUpperCase().indexOf("WINDOWS") == -1)
-		{
-			cmd[0] = "bash";
-			cmd[1] = "-c";
-		}
-		else	//This is just for windows
-		{
-			cmd[0] = "cmd";
-			cmd[1] = "/c";
-		}
-		cmd[2] = "java -classpath "+eclipseHomePath+System.getProperty("file.separator")+"plugins"+System.getProperty("file.separator")+"org.eclipse.equinox.launcher_*.jar
org.eclipse.equinox.launcher.Main -application org.apache.geronimo.j2g.sources.tool -data
"+eclipseWorkspacePath+webDir+" -configuration "+eclipseHomePath+System.getProperty("file.separator")+"configuration
-src "+sourceDir+" -geronimo "+geronimoHome;
-		
-		System.out.println("Executing: "+cmd[2]);
-		try {
-        Process cmdProcess = Runtime.getRuntime().exec(cmd);
-        
-        BufferedReader stdInput = new BufferedReader(new 
-             InputStreamReader(cmdProcess.getInputStream()));
-
-        BufferedReader stdError = new BufferedReader(new 
-             InputStreamReader(cmdProcess.getErrorStream()));
-        
-        while ((cmdOutput = stdInput.readLine()) != null) {
-            System.out.println(cmdOutput);
-        }
-
-        while ((cmdOutput = stdError.readLine()) != null) {
-            System.out.println(cmdOutput);
-        }
-    }
-
-    catch (IOException e) {
-        System.out.println("Error executing "+cmd[2]);
-        e.printStackTrace();
-    }
-	}
-
-	public void init(IViewPart view) {
-		
-	}
-
-}
-

Modified: geronimo/sandbox/j2g/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/pom.xml?view=diff&rev=560332&r1=560331&r2=560332
==============================================================================
--- geronimo/sandbox/j2g/plugins/pom.xml (original)
+++ geronimo/sandbox/j2g/plugins/pom.xml Fri Jul 27 10:39:24 2007
@@ -100,5 +100,6 @@
         <module>org.apache.geronimo.j2g.resources</module>
         <module>org.apache.geronimo.j2g.sources</module>
         <module>org.apache.geronimo.j2g.util</module>
+	<module>org.apache.geronimo.j2g.ui</module>
     </modules>
 </project>



Mime
View raw message