[jboss-cvs] JBossAS SVN: r79048 - in projects/aop/trunk/aophelper/src/main: java/org/jboss/aophelper/manager and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Oct 2 19:22:05 EDT 2008
Author: stalep
Date: 2008-10-02 19:22:04 -0400 (Thu, 02 Oct 2008)
New Revision: 79048
Removed:
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/compile/CompileManager.java
Modified:
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/manager/CompileManager.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/manager/RunManager.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/AopHelperFrame.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/AopHelperMenuBar.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/OutputPane.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/classpath/ClasspathPane.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/classpath/ClasspathTablePane.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/RunOutputPane.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/classpath/RunClasspathPane.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/classpath/RunClasspathTablePane.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopCompileCommand.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopRunCommand.java
projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/CommandUtil.java
projects/aop/trunk/aophelper/src/main/resources/jboss-aop.xml
Log:
[JBAOP-538]
added default classpaths to the classpathlist.
added error output widget for run and compile
added simple validation before run/compile
Deleted: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/compile/CompileManager.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/compile/CompileManager.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/compile/CompileManager.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -1,180 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.aophelper.compile;
-
-import java.io.File;
-
-import org.jboss.aophelper.core.Action;
-import org.jboss.aophelper.core.AopHandler;
-import org.jboss.aophelper.core.AopOption;
-import org.jboss.aophelper.ui.AopHelperMediator;
-import org.jboss.aophelper.ui.compile.CompileMediator;
-import org.jboss.aophelper.util.AopCompileCommand;
-
-/**
- * A CompileManager.
- *
- * @author <a href="stale.pedersen at jboss.org">Stale W. Pedersen</a>
- * @version $Revision: 1.1 $
- */
-public class CompileManager
-{
- private CompileMediator mediator;
-
- public CompileManager()
- {
- mediator = CompileMediator.instance();
- }
-
- public void performAction(Action a, AopOption to)
- {
- if(a.equals(Action.ADD))
- {
- if(to.equals(AopOption.CLASSPATH))
- addClasspath();
- else if(to.equals(AopOption.AOPXML))
- addXml();
- else if(to.equals(AopOption.SUPPRESS))
- setSuppress(true);
- else if(to.equals(AopOption.VERBOSE))
- setVerbose(true);
- else if(to.equals(AopOption.NOOPT))
- setNoopt(true);
- }
- else if(a.equals(Action.REMOVE))
- {
- if(to.equals(AopOption.CLASSPATH))
- removeClasspath();
- else if(to.equals(AopOption.AOPXML))
- removeXml();
- else if(to.equals(AopOption.SUPPRESS))
- setSuppress(false);
- else if(to.equals(AopOption.VERBOSE))
- setVerbose(false);
- else if(to.equals(AopOption.NOOPT))
- setNoopt(false);
- }
- else if(a.equals(Action.SET))
- {
- if(to.equals(AopOption.WORKINGDIR))
- setWorkingdir();
- }
- else if(a.equals(Action.RUN))
- {
- compile();
- }
-
- }
-
- private void addClasspath()
- {
- File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
-
- System.out.println("got "+files.length+" number of files");
-
- for(File f : files)
- {
- AopHandler.instance().getCompile().addClasspath(f.getAbsolutePath());
- mediator.getClasspathModel().addRow(f.getAbsolutePath());
- }
- }
-
- private void removeClasspath()
- {
- String selected = mediator.getClasspathTable().getSelectedItem();
- if(selected != null)
- {
- AopHandler.instance().getCompile().removeClasspath(selected);
- mediator.getClasspathModel().removeRow(selected);
- mediator.getClasspathTable().clearSelectedItem();
- }
- }
-
- private void addXml()
- {
- File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
-
- System.out.println("got "+files.length+" number of files");
-
- for(File f : files)
- {
- AopHandler.instance().getCompile().addXml(f.getAbsolutePath());
- mediator.getXmlModel().addRow(f.getAbsolutePath());
- }
- }
-
- private void removeXml()
- {
- String selected = mediator.getXmlTable().getSelectedItem();
- if(selected != null)
- {
- AopHandler.instance().getCompile().removeClasspath(selected);
- mediator.getXmlModel().removeRow(selected);
- mediator.getXmlTable().clearSelectedItem();
- }
- }
-
- private void setVerbose(boolean verbose)
- {
- AopHandler.instance().getCompile().setVerbose(verbose);
- }
-
- private void setSuppress(boolean suppress)
- {
- AopHandler.instance().getCompile().setSuppress(suppress);
- }
-
- private void setNoopt(boolean noopt)
- {
- AopHandler.instance().getCompile().setNoopt(noopt);
- }
-
- private void setWorkingdir()
- {
- File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
- for(File f : files)
- {
- AopHandler.instance().getCompile().setWorkingdir(f.getAbsolutePath());
- mediator.getCompileOptionsPane().setWorkingDir(f.getAbsolutePath());
- }
- }
-
- private void compile()
- {
- System.out.println("LETS COMPILE!");
- AopCompileCommand compile = new AopCompileCommand();
- String output = compile.execute();
- mediator.getOutputPane().setText(output);
- System.out.println("output: "+output);
-//
-// java.util.Properties props = System.getProperties();
-// java.util.Enumeration<?> e = props.propertyNames();
-//
-// while(e.hasMoreElements())
-// System.out.println(e.toString());
-
- System.out.println("CLASSPATH: "+System.getProperty("java.class.path"));
-
- }
-
-
-}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/manager/CompileManager.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/manager/CompileManager.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/manager/CompileManager.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -87,10 +87,7 @@
private void addClasspath()
{
- File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
-
- System.out.println("got "+files.length+" number of files");
-
+ File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
for(File f : files)
{
AopHandler.instance().getCompile().addClasspath(f.getAbsolutePath());
@@ -112,9 +109,6 @@
private void addXml()
{
File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
-
- System.out.println("got "+files.length+" number of files");
-
for(File f : files)
{
AopHandler.instance().getCompile().addXml(f.getAbsolutePath());
@@ -157,24 +151,23 @@
mediator.getCompileOptionsPane().setWorkingDir(f.getAbsolutePath());
}
}
-
+
private void compile()
{
- System.out.println("LETS COMPILE!");
- AopCompileCommand compile = new AopCompileCommand();
- String output = compile.execute();
- mediator.getOutputPane().setText(output);
- System.out.println("output: "+output);
-//
-// java.util.Properties props = System.getProperties();
-// java.util.Enumeration<?> e = props.propertyNames();
-//
-// while(e.hasMoreElements())
-// System.out.println(e.toString());
-
- System.out.println("CLASSPATH: "+System.getProperty("java.class.path"));
-
+ if(AopHandler.instance().getCompile().getWorkingdir() == null)
+ AopHelperMediator.instance().getMainPane().displayMessageDialog("Must set working directory");
+ else
+ {
+ AopCompileCommand compile = new AopCompileCommand();
+ String[] out = compile.execute();
+ mediator.getOutputPane().setText(out[0]);
+ mediator.getOutputPane().setError(out[1]);
+ System.out.println("output: "+out[0]);
+ }
}
+
+
+
}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/manager/RunManager.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/manager/RunManager.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/manager/RunManager.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -95,9 +95,6 @@
private void addClasspath()
{
File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
-
- System.out.println("got "+files.length+" number of files");
-
for(File f : files)
{
AopHandler.instance().getRun().addClasspath(f.getAbsolutePath());
@@ -118,10 +115,7 @@
private void addXml()
{
- File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
-
- System.out.println("got "+files.length+" number of files");
-
+ File[] files = AopHelperMediator.instance().getMainPane().createFileCooser();
for(File f : files)
{
AopHandler.instance().getRun().addXml(f.getAbsolutePath());
@@ -183,25 +177,17 @@
private void run()
{
- System.out.println("LETS RUN!");
+ if(AopHandler.instance().getRun().getWorkingdir() == null)
+ AopHelperMediator.instance().getMainPane().displayMessageDialog("Must set working directory");
+ else if(AopHandler.instance().getRun().getExecutionClass() == null)
+ AopHelperMediator.instance().getMainPane().displayMessageDialog("Must set execution class");
+ else
+ {
AopRunCommand run = new AopRunCommand();
- String output = run.execute();
- runMediator.getRunOutputPane().setText(output);
- System.out.println("output: "+output);
-
-// AopCompileCommand compile = new AopCompileCommand();
-// String output = compile.execute();
-// runMediator.getRunOutputPane().setText(output);
-// System.out.println("output: "+output);
-//
-// java.util.Properties props = System.getProperties();
-// java.util.Enumeration<?> e = props.propertyNames();
-//
-// while(e.hasMoreElements())
-// System.out.println(e.toString());
-
- System.out.println("CLASSPATH: "+System.getProperty("java.class.path"));
-
+ String[] out = run.execute();
+ runMediator.getRunOutputPane().setText(out[0]);
+ runMediator.getRunOutputPane().setError(out[1]);
+ }
}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/AopHelperFrame.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/AopHelperFrame.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/AopHelperFrame.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -30,6 +30,7 @@
import javax.swing.JFileChooser;
import javax.swing.JFrame;
+import javax.swing.JOptionPane;
import javax.swing.WindowConstants;
import org.jboss.aophelper.ui.compile.CompilerPane;
@@ -147,6 +148,11 @@
pack();
}
+ public void displayMessageDialog(String msg)
+ {
+ JOptionPane.showMessageDialog(this, msg);
+ }
+
public static void main(String[] args)
{
new AopHelperFrame();
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/AopHelperMenuBar.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/AopHelperMenuBar.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/AopHelperMenuBar.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -86,7 +86,7 @@
private void showDialog()
{
- JOptionPane.showConfirmDialog(this, "more info will come....", "JBoss AOP Helper", JOptionPane.OK_OPTION);
+ JOptionPane.showMessageDialog(this, "more info will come....");
}
private JMenu createFileMenu()
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/OutputPane.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/OutputPane.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/OutputPane.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -22,12 +22,12 @@
package org.jboss.aophelper.ui.compile;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
import javax.swing.JTextArea;
/**
@@ -43,6 +43,7 @@
private static final long serialVersionUID = 1L;
private JTextArea outputArea;
+ private JTextArea errorArea;
public OutputPane()
{
init();
@@ -52,7 +53,7 @@
{
CompileMediator.instance().setOutputPane(this);
- setBackground(Color.white);
+// setBackground(Color.white);
setLayout(new FlowLayout());
outputArea = new JTextArea();
@@ -60,17 +61,35 @@
outputArea.setLineWrap(true);
outputArea.setWrapStyleWord(true);
outputArea.setEditable(false);
- JScrollPane longScroll = new JScrollPane(outputArea);
- longScroll.setVisible(true);
- longScroll.setPreferredSize(new Dimension(1020, 270));
+ JScrollPane outputScroll = new JScrollPane(outputArea);
+ outputScroll.setVisible(true);
- add(longScroll, BorderLayout.CENTER);
+ errorArea = new JTextArea();
+ errorArea.setText("errors from the aopcompile will be seen here");
+ errorArea.setLineWrap(true);
+ errorArea.setWrapStyleWord(true);
+ errorArea.setEditable(false);
+ JScrollPane errorScroll = new JScrollPane(errorArea);
+ errorScroll.setVisible(true);
+
+ JTabbedPane tPane = new JTabbedPane();
+ tPane.addTab("Output", outputScroll);
+ tPane.addTab("Error", errorScroll);
+ tPane.setPreferredSize(new Dimension(1020, 270));
+
+ add(tPane, BorderLayout.CENTER);
+
}
public void setText(String text)
{
outputArea.setText(text);
}
+
+ public void setError(String error)
+ {
+ errorArea.setText(error);
+ }
}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/classpath/ClasspathPane.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/classpath/ClasspathPane.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/classpath/ClasspathPane.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -25,7 +25,10 @@
import java.awt.Dimension;
import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import org.jboss.aophelper.util.CommandUtil;
+
/**
* A ClasspathPane.
*
@@ -47,11 +50,12 @@
{
setLayout(new BorderLayout());
- ClasspathTablePane classpathTable = new ClasspathTablePane();
+ ClasspathTablePane classpathTable = new ClasspathTablePane(CommandUtil.getAopPaths());
+ JScrollPane scrollPane = new JScrollPane(classpathTable);
ClasspathEditPane classpathEditPane = new ClasspathEditPane();
add(classpathEditPane, BorderLayout.NORTH);
- add(classpathTable, BorderLayout.CENTER);
+ add(scrollPane, BorderLayout.CENTER);
Dimension size = new Dimension(500, 200);
setPreferredSize(size);
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/classpath/ClasspathTablePane.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/classpath/ClasspathTablePane.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/compile/classpath/ClasspathTablePane.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -23,6 +23,7 @@
import org.jboss.aophelper.annotation.AopHelperAction;
import org.jboss.aophelper.core.Action;
+import org.jboss.aophelper.core.AopHandler;
import org.jboss.aophelper.core.AopOption;
import org.jboss.aophelper.core.AopState;
import org.jboss.aophelper.ui.GenericEditTableModel;
@@ -44,9 +45,10 @@
private ClasspathTableModel tableModel;
- public ClasspathTablePane()
+ public ClasspathTablePane(String classpaths)
{
init();
+ insertClasspaths(classpaths);
}
@@ -55,7 +57,6 @@
{
if(tableModel == null)
tableModel = new ClasspathTableModel();
- System.out.println("setting tablemodel to the mediator: "+tableModel.getClass().getName());
CompileMediator.instance().setClasspathModel(tableModel);
}
@@ -77,4 +78,15 @@
{
}
+
+ private void insertClasspaths(String classpaths)
+ {
+ String[] cp = classpaths.split(System.getProperty("path.separator"));
+ for(String path : cp)
+ {
+ tableModel.addRow(path);
+ AopHandler.instance().getCompile().addClasspath(path);
+ }
+
+ }
}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/RunOutputPane.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/RunOutputPane.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/RunOutputPane.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -22,12 +22,12 @@
package org.jboss.aophelper.ui.run;
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
import javax.swing.JTextArea;
import org.jboss.aophelper.ui.run.RunMediator;
@@ -45,6 +45,8 @@
private static final long serialVersionUID = 1L;
private JTextArea outputArea;
+ private JTextArea errorArea;
+
public RunOutputPane()
{
init();
@@ -54,7 +56,6 @@
{
RunMediator.instance().setRunOutputPane(this);
- setBackground(Color.white);
setLayout(new FlowLayout());
outputArea = new JTextArea();
@@ -62,11 +63,23 @@
outputArea.setLineWrap(true);
outputArea.setWrapStyleWord(true);
outputArea.setEditable(false);
- JScrollPane longScroll = new JScrollPane(outputArea);
- longScroll.setVisible(true);
- longScroll.setPreferredSize(new Dimension(1020, 270));
+ JScrollPane outputScroll = new JScrollPane(outputArea);
+ outputScroll.setVisible(true);
- add(longScroll, BorderLayout.CENTER);
+ errorArea = new JTextArea();
+ errorArea.setText("errors from the execution will be seen here");
+ errorArea.setLineWrap(true);
+ errorArea.setWrapStyleWord(true);
+ errorArea.setEditable(false);
+ JScrollPane errorScroll = new JScrollPane(errorArea);
+ errorScroll.setVisible(true);
+
+ JTabbedPane tPane = new JTabbedPane();
+ tPane.addTab("Output", outputScroll);
+ tPane.addTab("Error", errorScroll);
+ tPane.setPreferredSize(new Dimension(1020, 270));
+
+ add(tPane, BorderLayout.CENTER);
}
@@ -75,5 +88,9 @@
outputArea.setText(text);
}
+ public void setError(String error)
+ {
+ errorArea.setText(error);
+ }
}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/classpath/RunClasspathPane.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/classpath/RunClasspathPane.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/classpath/RunClasspathPane.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -25,7 +25,10 @@
import java.awt.Dimension;
import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import org.jboss.aophelper.util.CommandUtil;
+
/**
* A RunClasspathPane.
*
@@ -48,11 +51,12 @@
{
setLayout(new BorderLayout());
- RunClasspathTablePane classpathTable = new RunClasspathTablePane();
+ RunClasspathTablePane classpathTable = new RunClasspathTablePane(CommandUtil.getAopPaths());
RunClasspathEditPane classpathEditPane = new RunClasspathEditPane();
+ JScrollPane scrollPane = new JScrollPane(classpathTable);
add(classpathEditPane, BorderLayout.NORTH);
- add(classpathTable, BorderLayout.CENTER);
+ add(scrollPane, BorderLayout.CENTER);
Dimension size = new Dimension(500, 200);
setPreferredSize(size);
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/classpath/RunClasspathTablePane.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/classpath/RunClasspathTablePane.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/ui/run/classpath/RunClasspathTablePane.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -23,6 +23,7 @@
import org.jboss.aophelper.annotation.AopHelperAction;
import org.jboss.aophelper.core.Action;
+import org.jboss.aophelper.core.AopHandler;
import org.jboss.aophelper.core.AopOption;
import org.jboss.aophelper.core.AopState;
import org.jboss.aophelper.ui.GenericEditTableModel;
@@ -43,9 +44,10 @@
private RunClasspathTableModel tableModel;
- public RunClasspathTablePane()
+ public RunClasspathTablePane(String classpaths)
{
init();
+ insertClasspaths(classpaths);
}
@@ -77,4 +79,15 @@
}
+ private void insertClasspaths(String classpaths)
+ {
+ String[] cp = classpaths.split(System.getProperty("path.separator"));
+ for(String path : cp)
+ {
+ tableModel.addRow(path);
+ AopHandler.instance().getRun().addClasspath(path);
+ }
+
+ }
+
}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopCompileCommand.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopCompileCommand.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopCompileCommand.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -36,7 +36,7 @@
public class AopCompileCommand
{
- public String execute()
+ public String[] execute()
{
String execute = setup();
try
@@ -62,7 +62,7 @@
AopCompile compileOptions = AopHandler.instance().getCompile();
StringBuilder execute = new StringBuilder();
- execute.append("java -cp ").append(CommandUtil.getAopPaths());
+ execute.append("java -cp ").append(getClasspath());
execute.append(" org.jboss.aop.standalone.Compiler ");
if(compileOptions.isVerbose())
execute.append("-verbose ");
@@ -95,5 +95,22 @@
return execute.toString();
}
+
+ private String getClasspath()
+ {
+ StringBuilder sb = new StringBuilder();
+ String pathSeparator = System.getProperty("path.separator");
+ for(String path : AopHandler.instance().getCompile().getClasspath())
+ {
+ if(sb.length() > 0)
+ sb.append(pathSeparator);
+ sb.append(path);
+ }
+ if(sb.length() > 0)
+ sb.append(pathSeparator);
+ sb.append(AopHandler.instance().getCompile().getWorkingdir());
+
+ return sb.toString();
+ }
}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopRunCommand.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopRunCommand.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopRunCommand.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -37,7 +37,7 @@
{
- public String execute()
+ public String[] execute()
{
String execute = setup();
try
@@ -65,7 +65,7 @@
execute.append("java ");
if(runOptions.isLoadtime())
execute.append(getLoadtimePath());
- execute.append(" -cp ").append(CommandUtil.getAopPaths());
+ execute.append(" -cp ").append(getClasspath());
// execute.append(" org.jboss.aop.standalone.Compiler ");
execute.append(" ");
if(runOptions.isVerbose())
@@ -133,4 +133,23 @@
}
return null;
}
+
+
+ private String getClasspath()
+ {
+ StringBuilder sb = new StringBuilder();
+ String pathSeparator = System.getProperty("path.separator");
+ for(String path : AopHandler.instance().getRun().getClasspath())
+ {
+ if(sb.length() > 0)
+ sb.append(pathSeparator);
+ sb.append(path);
+ }
+ if(sb.length() > 0)
+ sb.append(pathSeparator);
+ sb.append(AopHandler.instance().getRun().getWorkingdir());
+
+ System.out.println("cp: "+sb);
+ return sb.toString();
+ }
}
Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/CommandUtil.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/CommandUtil.java 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/CommandUtil.java 2008-10-02 23:22:04 UTC (rev 79048)
@@ -61,19 +61,21 @@
aopPaths.append(p).append(pathSeparator);
}
- aopPaths.append(".");
+// aopPaths.append(".");
return aopPaths.toString();
}
- public static String analyzeProcess(Process process)
+ public static String[] analyzeProcess(Process process)
{
BufferedReader br = new BufferedReader( new InputStreamReader( process.getInputStream() ) );
String line;
StringBuffer output = new StringBuffer();
+ StringBuffer error = new StringBuffer();
+
try
{
@@ -95,6 +97,7 @@
while(( line = errorBr.readLine()) != null)
{
System.out.println("ERROR: "+line);
+ error.append("\n").append(line);
}
}
catch(IOException e)
@@ -104,7 +107,12 @@
System.out.println("INPUTSTREAM: "+output.toString());
- return output.toString();
+ String[] out = new String[2];
+ out[0] = output.toString();
+ out[1] = error.toString();
+
+ return out;
+
}
Modified: projects/aop/trunk/aophelper/src/main/resources/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aophelper/src/main/resources/jboss-aop.xml 2008-10-02 22:34:02 UTC (rev 79047)
+++ projects/aop/trunk/aophelper/src/main/resources/jboss-aop.xml 2008-10-02 23:22:04 UTC (rev 79048)
@@ -4,21 +4,5 @@
<bind pointcut="execution(* *->@org.jboss.aophelper.annotation.AopHelperAction(..))">
<interceptor class="org.jboss.aophelper.core.SettingInterceptor"/>
</bind>
-<!--
- <bind pointcut="execution(* *->@org.jboss.aophelper.annotation.Remove(..))">
- <interceptor class="org.jboss.aophelper.ui.aopcompile.ClasspathInterceptor"/>
- </bind>
-
- <bind pointcut="all(@org.jboss.aop.annotation.Add)">
- <interceptor class="org.jboss.aop.ui.aopcompile.ClasspathInterceptor"/>
- </bind>
- -->
-
-<!--
- <bind pointcut="execution(public void org.jboss.aop.ui.aopcompile.*->add())">
- <interceptor class="org.jboss.aop.ui.aopcompile.ClasspathInterceptor"/>
- </bind>
- -->
-
</aop>
More information about the jboss-cvs-commits
mailing list