[prev in list] [next in list] [prev in thread] [next in thread]
List: wsf-java-dev
Subject: [wsf-java-dev] svn commit r1892 - in
From: svn () wso2 ! org (svn () wso2 ! org)
Date: 2007-04-18 21:56:50
Message-ID: E1HeOhL-0001Ii-UC () wso2 ! org
[Download RAW message or body]
Author: sandakith
Date: Wed Apr 18 21:56:35 2007
New Revision: 1892
Added:
trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/WSASPropertiesUtil.java
Modified:
trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/constant/WSASConfigurationConstant.java
trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/plugin/WSASStartAction.java
trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/plugin/WSASStopAction.java
trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/PopupMessageUtil.java
trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/WSASClassLoadingUtil.java
Log:
added wsas properties to work with the idea plugin
Modified: trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/constant/WSASConfigurationConstant.java
==============================================================================
--- trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/constant/WSASConfigurationConstant.java (original)
+++ trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/constant/WSASConfigurationConstant.java Wed \
Apr 18 21:56:35 2007 @@ -23,6 +23,7 @@
public static String LIB = "lib";
public static String DOT_TEXT = ".txt";
public static String DOT_JAR = ".jar";
+ public static String DOT_PROPERTIES = ".properties";
public static String WSAS_MAIN_CLASS = "org.wso2.wsas.Main";
//icon paths
@@ -30,4 +31,17 @@
public static String ICON_WSAS_START = "/icons/start.gif";
public static String ICON_WSAS_STOP = "/icons/stop.gif";
+ //wsas
+ public static final String WSO2WSAS_HOME = "wso2wsas.home";
+ public static final String WSO2WSAS_SERVER_XML = "server.xml";
+ public static final String WSO2WSAS_START_TIME = "wso2wsas.start.time";
+ public static final String WSO2WSAS_ADMIN_PASSWORD = "wso2wsas.admin.password";
+ public static final String AXIS2_HOME = "axis2.home";
+ public static final String DERBY_HOME = "derby.system.home";
+ public static final String WSO2WSAS_SERVER_XML_PROP = "wso2.wsas.server.xml";
+
+ //log4j
+ public static final String LOG4J_CONFIGURATION = "log4j.configuration";
+
+
}
Modified: trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/plugin/WSASStartAction.java
==============================================================================
--- trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/plugin/WSASStartAction.java (original)
+++ trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/plugin/WSASStartAction.java Wed \
Apr 18 21:56:35 2007 @@ -24,6 +24,7 @@
import org.wso2.wsf.idea.ws.util.WSASClassLoadingUtil;
import org.wso2.wsf.idea.ws.util.PopupMessageUtil;
+import org.wso2.wsf.idea.ws.util.WSASPropertiesUtil;
import org.wso2.wsf.idea.ws.bean.WSASConfigurationBean;
import org.wso2.wsf.idea.ws.constant.WSASMessageConstant;
import org.wso2.wsf.idea.ws.constant.WSASConfigurationConstant;
@@ -35,28 +36,30 @@
private ImageIcon myIcon;
public void actionPerformed(AnActionEvent e) {
- if(WSASConfigurationBean.getWsasInstallationPath().equals( null)){
+ if (WSASConfigurationBean.getWsasInstallationPath().equals(null)) {
PopupMessageUtil.popupWarningMessageBox(WSASMessageConstant.WARNING_WSAS_PATH_NOT_SET);
- }else if(WSASConfigurationBean.getWsasInstallationPath().equals(WSASConfigurationConstant.WSAS_DEFAULT_PATH) \
){ + } else
+ if (WSASConfigurationBean.getWsasInstallationPath().equals(WSASConfigurationConstant.WSAS_DEFAULT_PATH)) \
{
PopupMessageUtil.popupWarningMessageBox(WSASMessageConstant.WARNING_WSAS_PATH_NOT_SET);
- }else{
+ } else {
+ //Set WSAS system properties
+ WSASPropertiesUtil.setWSASProperties();
WSASClassLoadingUtil.init(WSASConfigurationBean.getWsasInstallationPath());
Class wsasMainClass = \
WSASClassLoadingUtil.loadClassFromAntClassLoader(WSASConfigurationConstant.WSAS_MAIN_CLASS);
- System.out.println(wsasMainClass.toString());
try {
- Class[] parameterTypes1 = new Class[1];
- parameterTypes1[0] = String[].class;
- Method mainMethod = wsasMainClass.getMethod("main", \
parameterTypes1);
- mainMethod.invoke(null, null);
+ Method mainMethod = wsasMainClass.getMethod("main", new \
Class[]{String[].class}); + String run[] = {"RUN"};
+ Object mainArgs[] = {run};
+ mainMethod.invoke(null, mainArgs);
} catch (NoSuchMethodException e1) {
e1.printStackTrace();
} catch (IllegalAccessException e1) {
e1.printStackTrace();
} catch (InvocationTargetException e1) {
e1.printStackTrace();
+ } finally {
+ WSASClassLoadingUtil.cleanupAntClassLoader();
}
-
-
}
}
Modified: trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/plugin/WSASStopAction.java
==============================================================================
--- trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/plugin/WSASStopAction.java (original)
+++ trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/plugin/WSASStopAction.java Wed \
Apr 18 21:56:35 2007 @@ -33,6 +33,9 @@
public void actionPerformed(AnActionEvent e) {
if(!WSASConfigurationBean.isWsasStartStatus()){
PopupMessageUtil.popupWarningMessageBox(WSASMessageConstant.WARNING_WSAS_NOT_STARTED);
+ }else{
+ //Shutdown WSAS
+
}
}
Modified: trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/PopupMessageUtil.java
==============================================================================
--- trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/PopupMessageUtil.java (original)
+++ trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/PopupMessageUtil.java Wed \
Apr 18 21:56:35 2007 @@ -36,4 +36,12 @@
);
}
+ public static void popupInformationMessageBox(String infoMessage) {
+ Messages.showMessageDialog(
+ infoMessage,
+ WSASMessageConstant.WARNING_WSAS_HEADING,
+ Messages.getInformationIcon()
+ );
+ }
+
}
Modified: trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/WSASClassLoadingUtil.java
==============================================================================
--- trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/WSASClassLoadingUtil.java (original)
+++ trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/WSASClassLoadingUtil.java Wed \
Apr 18 21:56:35 2007 @@ -79,7 +79,7 @@
private static String[] getWSASLibs(String wsasPath){
File wsasLibPath = new File(wsasPath+File.separator+ \
WSASConfigurationConstant.LIB);
- wsasClassPath = new String[wsasLibPath.list().length];
+ wsasClassPath = new String[wsasLibPath.list().length+3];
libCount = 0;
visitAllFiles(wsasLibPath);
return wsasClassPath;
@@ -93,13 +93,18 @@
visitAllFiles(new File(dir, children[i]));
}
} else {
- if(dir.toString().endsWith(WSASConfigurationConstant.DOT_JAR)){
+ if(dir.toString().endsWith(WSASConfigurationConstant.DOT_JAR) || \
dir.toString().endsWith(WSASConfigurationConstant.DOT_PROPERTIES)){ \
wsasClassPath[libCount]=dir.getAbsolutePath(); libCount+=1;
}
}
}
+ public static void cleanupAntClassLoader(){
+ wsasClassPath = null;
+ antClassLoader.cleanup();
+ }
+
}
Added: trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/WSASPropertiesUtil.java
==============================================================================
--- (empty file)
+++ trunk/wsf/java/modules/idea-plugins/src/org/wso2/wsf/idea/ws/util/WSASPropertiesUtil.java Wed \
Apr 18 21:56:35 2007 @@ -0,0 +1,48 @@
+/*
+ * Copyright 2005,2006 WSO2, Inc. http://www.wso2.org
+ *
+ * Licensed 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.wso2.wsf.idea.ws.util;
+
+import org.wso2.wsf.idea.ws.constant.WSASConfigurationConstant;
+import org.wso2.wsf.idea.ws.bean.WSASConfigurationBean;
+
+import java.io.File;
+
+public class WSASPropertiesUtil {
+
+ public static void setWSASProperties() {
+ System.setProperty(WSASConfigurationConstant.WSO2WSAS_HOME,
+ WSASConfigurationBean.getWsasInstallationPath());
+ System.setProperty(
+ WSASConfigurationConstant.DERBY_HOME,
+ getDBHome(WSASConfigurationBean.getWsasInstallationPath())
+ );
+ System.setProperty(
+ WSASConfigurationConstant.LOG4J_CONFIGURATION,
+ getLog4JConfigurationPath(WSASConfigurationBean.getWsasInstallationPath())
+ );
+ }
+
+ private static String getDBHome(String wsasPath) {
+ return wsasPath + File.separator + "database" + File.separator + \
"WSO2WSAS_DB"; + }
+
+ private static String getLog4JConfigurationPath(String wsasPath) {
+
+ return wsasPath + File.separator + "conf" + File.separator + \
"log4j.properties"; + }
+
+
+}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic