You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by th...@apache.org on 2006/11/09 14:17:28 UTC
svn commit: r472889 - in
/webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main:
java/org/apache/axis2/tools/idea/ java/org/apache/ideaplugin/frames/
resources/META-INF/
Author: thilina
Date: Thu Nov 9 05:17:27 2006
New Revision: 472889
URL: http://svn.apache.org/viewvc?view=rev&rev=472889
Log:
applying the patch given at http://issues.apache.org/jira/browse/AXIS2-1622
Thanx Keith...
Modified:
webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/resources/META-INF/plugin.xml
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java?view=diff&rev=472889&r1=472888&r2=472889
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/BottomPanel.java Thu Nov 9 05:17:27 2006
@@ -105,13 +105,13 @@
} catch (Exception e1) {
StringWriter writer = new StringWriter();
JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 codegeneration", JOptionPane.ERROR_MESSAGE);
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
}
- JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration successful!",
- "Axis2 codegeneration", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(java2CodeFrame, "Code generation successful!",
+ "Axis2 code generation", JOptionPane.INFORMATION_MESSAGE);
java2CodeFrame.dispose();
return;
@@ -136,7 +136,7 @@
} catch (Exception e1) {
StringWriter writer = new StringWriter();
JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 codegeneration", JOptionPane.ERROR_MESSAGE);
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
}
@@ -152,7 +152,7 @@
} catch (Exception e1) {
StringWriter writer = new StringWriter();
JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 codegeneration", JOptionPane.ERROR_MESSAGE);
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
}
@@ -170,7 +170,7 @@
} catch (Exception e1) {
StringWriter writer = new StringWriter();
JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 codegeneration", JOptionPane.ERROR_MESSAGE);
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
}
@@ -185,7 +185,7 @@
} catch (Exception e1) {
StringWriter writer = new StringWriter();
JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 codegeneration", JOptionPane.ERROR_MESSAGE);
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
}
@@ -213,7 +213,7 @@
} catch (Exception e1) {
StringWriter writer = new StringWriter();
JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 codegeneration", JOptionPane.ERROR_MESSAGE);
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
@@ -230,7 +230,7 @@
} catch (Exception e1) {
StringWriter writer = new StringWriter();
JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration failed!" + writer.toString(),
- "Axis2 codegeneration", JOptionPane.ERROR_MESSAGE);
+ "Axis2 code generation", JOptionPane.ERROR_MESSAGE);
java2CodeFrame.dispose();
return;
}
@@ -245,8 +245,8 @@
}
}
- JOptionPane.showMessageDialog(java2CodeFrame, "Code genaration successful!",
- "Axis2 codegeneration", JOptionPane.INFORMATION_MESSAGE);
+ JOptionPane.showMessageDialog(java2CodeFrame, "Code generation successful!",
+ "Axis2 code generation", JOptionPane.INFORMATION_MESSAGE);
java2CodeFrame.dispose();
return;
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java?view=diff&rev=472889&r1=472888&r2=472889
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/Java2CodeFrame.java Thu Nov 9 05:17:27 2006
@@ -192,14 +192,13 @@
SrcCompiler compiler = new SrcCompiler();
compiler.compileSource(temp.getAbsolutePath());
String wsdl = codegenBean.getWSDLFileName();
- final String name = wsdl.substring(wsdl.lastIndexOf(File.separatorChar) + 1, wsdl.lastIndexOf(".")) + "-stub.jar";
- System.out.println(name);
+ final String name = wsdl.substring(wsdl.lastIndexOf(File.separatorChar) + 1, wsdl.lastIndexOf(".")) + "-stub";
final File lib = new File(codegenBean.getActiveProject().getProjectFile().getParent().getPath() + File.separator + "lib");
if (!lib.isDirectory()) {
lib.mkdir();
}
JarFileWriter jarFileWriter = new JarFileWriter();
- jarFileWriter.writeJarFile(lib, name, new File(temp + File.separator + "classes"));
+ jarFileWriter.writeJarFile(lib, name + ".jar", new File(temp + File.separator + "classes"));
Project project = codegenBean.getActiveProject();
final LibraryTable table = (LibraryTable) project.getComponent(LibraryTable.class);
@@ -211,7 +210,7 @@
Runnable() {
public void run() {
- String url = VirtualFileManager.constructUrl(JarFileSystem.PROTOCOL, lib.getAbsolutePath() + File.separator + name) + JarFileSystem.JAR_SEPARATOR;
+ String url = VirtualFileManager.constructUrl(JarFileSystem.PROTOCOL, lib.getAbsolutePath() + File.separator + name + ".jar") + JarFileSystem.JAR_SEPARATOR;
@@ -259,7 +258,7 @@
break;
}
case 2: {
- panel_3.setCaptions(" Options"
+ panel_3.setCaptions(" Custom Options"
, " Set the options for the code generation");
this.secondPanel.setVisible(true);
@@ -282,7 +281,7 @@
break;
}
- panel_3.setCaptions(" Output"
+ panel_3.setCaptions(" Set the output location for the generated code"
, " set the output project for the generated code");
this.secondPanel.setVisible(false);
this.plMiddle.setVisible(false);
@@ -347,7 +346,7 @@
this.backButtonImpl();
break;
}
- panel_3.setCaptions(" Options"
+ panel_3.setCaptions(" Custom Options"
, " Set the options for the code generation");
this.secondPanel.setVisible(true);
@@ -358,7 +357,7 @@
break;
}
case 3: {
- panel_3.setCaptions(" Output"
+ panel_3.setCaptions(" Set the output location for the generated code"
, " set the output project for the generated code");
this.secondPanel.setVisible(false);
this.plMiddle.setVisible(false);
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java?view=diff&rev=472889&r1=472888&r2=472889
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OptionPane.java Thu Nov 9 05:17:27 2006
@@ -35,7 +35,7 @@
setLayout(customLayout);
- lblOption = new JLabel("Please select your option");
+ lblOption = new JLabel("");
add(lblOption);
buttonGroup = new ButtonGroup();
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java?view=diff&rev=472889&r1=472888&r2=472889
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/axis2/tools/idea/OutPutPane.java Thu Nov 9 05:17:27 2006
@@ -229,7 +229,7 @@
}
c = parent.getComponent(5);
if (c.isVisible()) {
- c.setBounds(insets.left + 200, insets.top + 40, 250, 24);
+ c.setBounds(insets.left + 200, insets.top + 40, 330, 24);
}
c = parent.getComponent(6);
if (c.isVisible()) {
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java?view=diff&rev=472889&r1=472888&r2=472889
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/java/org/apache/ideaplugin/frames/Axi2PluginPage.java Thu Nov 9 05:17:27 2006
@@ -57,7 +57,7 @@
cbg.add(service);
getContentPane().add(service);
- javawsdl = new JRadioButton("WSDL2Code codegenaration", false);
+ javawsdl = new JRadioButton("WSDL2Code code generation", false);
javawsdl.setToolTipText("Helps generate skeletons and stubs for a given WSDL");
cbg.add(javawsdl);
getContentPane().add(javawsdl);
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/resources/META-INF/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/resources/META-INF/plugin.xml?view=diff&rev=472889&r1=472888&r2=472889
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/resources/META-INF/plugin.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-idea-plugin/src/main/resources/META-INF/plugin.xml Thu Nov 9 05:17:27 2006
@@ -1,58 +1,58 @@
-<!DOCTYPE idea-plugin PUBLIC "Plugin/DTD" "http://plugins.intellij.net/plugin.dtd">
-<!--<idea-plugin>-->
-<idea-plugin url="http://www.apache.org/~deepal">
-
- <!-- Plugin name -->
- <name>Axis2 IDEA tools</name>
-
- <!-- Description -->
- <description> Service Archive creation and Code Generation </description>
-
- <!-- Plugin version -->
- <version>1.0</version>
-
- <!-- Plugin's vendor -->
- <!-- <vendor logo="/general/ijLogo.png">IntelliJ</vendor>-->
- <vendor email="deepal@apache.org">Deepal Jayasinghe </vendor>
-
- <!-- the IDEA build number which works with plugin -->
- <idea-version since-build="2000" />
-
- <!-- Plugin's application components -->
- <application-components>
- <component>
- <!-- Component's implementation class -->
- <implementation-class>org.apache.ideaplugin.plugin.Axis2IdeaPlugin</implementation-class>
-
- <!-- Component's interface class -->
- <interface-class>org.apache.ideaplugin.plugin.Axis2IdeaPlugin</interface-class>
- </component>
- </application-components>
- <!-- Component's actions -->
- <actions>
- <!-- We use "PluginName.ComponentName.ActionName" notation for "id" to avoid conflicts -->
- <action id="ActionsSample.ActionsPlugin.ServiceArchiveCreator"
- class="org.apache.ideaplugin.plugin.Axis2PluginAction"
- text="Axis2 plugins" description="Service creation and codegeneration">
- <keyboard-shortcut first-keystroke="alt W" second-keystroke="C" keymap="$default"/>
- <mouse-shortcut keystroke="ctrl alt button2" keymap="$default"/>
- </action>
-
- <!-- <group id="Actions.ActionsPlugin.SampleGroup" text="S_ample" description="Sample group">-->
- <group id="Actions.ActionsPlugin.SampleGroup" text="Axis2" description="Axis2 Group">
- <reference id="ActionsSample.ActionsPlugin.ServiceArchiveCreator"/>
- <separator/>
- <add-to-group group-id="MainMenu" anchor="last"/>
- <add-to-group group-id="MainToolBar" anchor="before" relative-to-action="HelpTopics"/>
- </group>
-
- <!--the group below contains only the "Hello World" action defined above -->
- <group>
- <reference id="ActionsSample.ActionsPlugin.ServiceArchiveCreator"/>
- <!--the group is added to the editor popup menu-->
- <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="CutCopyPasteGroup"/>
- </group>
-
- </actions>
-
-</idea-plugin>
+<!DOCTYPE idea-plugin PUBLIC "Plugin/DTD" "http://plugins.intellij.net/plugin.dtd">
+<!--<idea-plugin>-->
+<idea-plugin url="http://www.apache.org/~deepal">
+
+ <!-- Plugin name -->
+ <name>Axis2 IDEA tools</name>
+
+ <!-- Description -->
+ <description> Service Archive creation and Code Generation </description>
+
+ <!-- Plugin version -->
+ <version>1.0</version>
+
+ <!-- Plugin's vendor -->
+ <!-- <vendor logo="/general/ijLogo.png">IntelliJ</vendor>-->
+ <vendor email="deepal@apache.org">Deepal Jayasinghe </vendor>
+
+ <!-- the IDEA build number which works with plugin -->
+ <idea-version since-build="2000" />
+
+ <!-- Plugin's application components -->
+ <application-components>
+ <component>
+ <!-- Component's implementation class -->
+ <implementation-class>org.apache.ideaplugin.plugin.Axis2IdeaPlugin</implementation-class>
+
+ <!-- Component's interface class -->
+ <interface-class>org.apache.ideaplugin.plugin.Axis2IdeaPlugin</interface-class>
+ </component>
+ </application-components>
+ <!-- Component's actions -->
+ <actions>
+ <!-- We use "PluginName.ComponentName.ActionName" notation for "id" to avoid conflicts -->
+ <action id="ActionsSample.ActionsPlugin.ServiceArchiveCreator"
+ class="org.apache.ideaplugin.plugin.Axis2PluginAction"
+ text="Axis2 plugins" description="Service creation and code generation">
+ <keyboard-shortcut first-keystroke="alt W" second-keystroke="C" keymap="$default"/>
+ <mouse-shortcut keystroke="ctrl alt button2" keymap="$default"/>
+ </action>
+
+ <!-- <group id="Actions.ActionsPlugin.SampleGroup" text="S_ample" description="Sample group">-->
+ <group id="Actions.ActionsPlugin.SampleGroup" text="Axis2" description="Axis2 Group">
+ <reference id="ActionsSample.ActionsPlugin.ServiceArchiveCreator"/>
+ <separator/>
+ <add-to-group group-id="MainMenu" anchor="last"/>
+ <add-to-group group-id="MainToolBar" anchor="before" relative-to-action="HelpTopics"/>
+ </group>
+
+ <!--the group below contains only the "Hello World" action defined above -->
+ <group>
+ <reference id="ActionsSample.ActionsPlugin.ServiceArchiveCreator"/>
+ <!--the group is added to the editor popup menu-->
+ <add-to-group group-id="EditorPopupMenu" anchor="after" relative-to-action="CutCopyPasteGroup"/>
+ </group>
+
+ </actions>
+
+</idea-plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org