Author: plightbo
Date: Mon Apr 24 17:49:33 2006
New Revision: 396750
URL: http://svn.apache.org/viewcvs?rev=396750&view=rev
Log:
QuickStart works under the maven build by taking advantage of the idea
configurations
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
incubator/webwork2/pom.xml
incubator/webwork2/src/main/idea/workspace.xml
incubator/webwork2/webapps/showcase/quickstart.xml
Modified:
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java?rev=396750&r1=396749&r2=396750&view=diff
==============================================================================
---
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
(original)
+++
incubator/webwork2/action/src/main/java/org/apache/struts/action2/quickstart/QuickStart.java
Mon Apr 24 17:49:33 2006
@@ -102,21 +102,41 @@
return;
}
+
+ // ok, clean up the classpath crap
+ TreeSet finalLibs = new TreeSet();
+ for (Iterator iterator = c.getLibs().iterator(); iterator.hasNext();) {
+ String s = (String) iterator.next();
+ finalLibs.add(s);
+ }
+ TreeSet finalClasses = new TreeSet();
+ for (Iterator iterator = c.getClassDirs().iterator();
iterator.hasNext();) {
+ String s = (String) iterator.next();
+ finalClasses.add(s);
+ }
+ TreeSet finalSources = new TreeSet();
+ if (c.getSources() != null) {
+ for (Iterator iterator = c.getSources().iterator();
iterator.hasNext();) {
+ String s = (String) iterator.next();
+ finalSources.add(s);
+ }
+ }
+
// explain what is being executed
System.out.println("Launching Jetty with the following
configuration:");
System.out.println("Jars/Directory of jars:");
- for (Iterator iterator = c.getLibs().iterator(); iterator.hasNext();) {
+ for (Iterator iterator = finalLibs.iterator(); iterator.hasNext();) {
String s = (String) iterator.next();
System.out.println(" " + s);
}
System.out.println("Directories of classes:");
- for (Iterator iterator = c.getClassDirs().iterator();
iterator.hasNext();) {
+ for (Iterator iterator = finalClasses.iterator(); iterator.hasNext();)
{
String s = (String) iterator.next();
System.out.println(" " + s);
}
- if (c.getSources() != null) {
+ if (!finalSources.isEmpty()) {
System.out.println("Sources:");
- for (Iterator iterator = c.getSources().iterator();
iterator.hasNext();) {
+ for (Iterator iterator = finalSources.iterator();
iterator.hasNext();) {
String s = (String) iterator.next();
System.out.println(" " + s);
}
@@ -130,12 +150,12 @@
// prepare the classloader
List libs = c.getLibs();
List classDirs = c.getClassDirs();
- ClassLoader parent = new MultiDirClassLoader((String[])
libs.toArray(new String[libs.size()]),
- (String[]) classDirs.toArray(new String[classDirs.size()]),
+ ClassLoader parent = new MultiDirClassLoader((String[])
finalLibs.toArray(new String[finalLibs.size()]),
+ (String[]) finalClasses.toArray(new
String[finalClasses.size()]),
Thread.currentThread().getContextClassLoader());
- if (c.getSources() != null) {
- for (Iterator iterator = c.getSources().iterator();
iterator.hasNext();) {
+ if (!finalSources.isEmpty()) {
+ for (Iterator iterator = finalSources.iterator();
iterator.hasNext();) {
String source = (String) iterator.next();
File file = new File(source);
CompilingClassLoader ccl = new CompilingClassLoader(parent,
file);
Modified: incubator/webwork2/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/pom.xml?rev=396750&r1=396749&r2=396750&view=diff
==============================================================================
--- incubator/webwork2/pom.xml (original)
+++ incubator/webwork2/pom.xml Mon Apr 24 17:49:33 2006
@@ -142,6 +142,7 @@
<jdkName>1.5</jdkName>
<exclude>target,test-output,.clover</exclude>
<useShortDependencyNames>true</useShortDependencyNames>
+ <!--
<libraries>
<library>
<name>xwork</name>
@@ -152,6 +153,7 @@
<sources>file://$xwork$/tiger/src/java</sources>
</library>
</libraries>
+ -->
</configuration>
</plugin>
<plugin>
Modified: incubator/webwork2/src/main/idea/workspace.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/src/main/idea/workspace.xml?rev=396750&r1=396749&r2=396750&view=diff
==============================================================================
--- incubator/webwork2/src/main/idea/workspace.xml (original)
+++ incubator/webwork2/src/main/idea/workspace.xml Mon Apr 24 17:49:33 2006
@@ -1,69 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4" relativePaths="false">
- <component name="RunManager">
- <activeType name="JUnit" />
- <configuration selected="false" default="true" type="JUnit"
factoryName="JUnit">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- </configuration>
- <configuration selected="false" default="true" type="Remote"
factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
- <configuration selected="false" default="true" type="Application"
factoryName="Application">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <module name="" />
- </configuration>
- <configuration selected="false" default="true" type="Applet"
factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE"
value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- </configuration>
- <configuration selected="true" default="false" name="All Tests"
type="JUnit" factoryName="JUnit">
- <module name="action" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" value="" />
- <option name="PACKAGE_NAME" value="org.apache.struts.action2" />
- <option name="MAIN_CLASS_NAME" value="" />
- <option name="METHOD_NAME" value="" />
- <option name="TEST_OBJECT" value="package" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="singleModule" />
- </option>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Run" />
- </configuration>
- </component>
+ <component name="RunManager">
+ <activeType name="JUnit"/>
+ <configuration selected="false" default="true" type="JUnit"
factoryName="JUnit">
+ <module name=""/>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
+ <option name="ALTERNATIVE_JRE_PATH"/>
+ <option name="PACKAGE_NAME"/>
+ <option name="MAIN_CLASS_NAME"/>
+ <option name="METHOD_NAME"/>
+ <option name="TEST_OBJECT" value="class"/>
+ <option name="VM_PARAMETERS"/>
+ <option name="PARAMETERS"/>
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
+ <option name="ADDITIONAL_CLASS_PATH"/>
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject"/>
+ </option>
+ </configuration>
+ <configuration selected="false" default="true" type="Remote"
factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true"/>
+ <option name="SERVER_MODE" value="false"/>
+ <option name="SHMEM_ADDRESS" value="javadebug"/>
+ <option name="HOST" value="localhost"/>
+ <option name="PORT" value="5005"/>
+ </configuration>
+ <configuration selected="false" default="true" type="Application"
factoryName="Application">
+ <option name="MAIN_CLASS_NAME"/>
+ <option name="VM_PARAMETERS"/>
+ <option name="PROGRAM_PARAMETERS"/>
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
+ <option name="ALTERNATIVE_JRE_PATH"/>
+ <module name=""/>
+ </configuration>
+ <configuration selected="false" default="true" type="Applet"
factoryName="Applet">
+ <module name=""/>
+ <option name="MAIN_CLASS_NAME"/>
+ <option name="HTML_FILE_NAME"/>
+ <option name="HTML_USED" value="false"/>
+ <option name="WIDTH" value="400"/>
+ <option name="HEIGHT" value="300"/>
+ <option name="POLICY_FILE"
value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy"/>
+ <option name="VM_PARAMETERS"/>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
+ <option name="ALTERNATIVE_JRE_PATH"/>
+ </configuration>
+ <configuration selected="false" default="false" name="All Tests"
type="JUnit" factoryName="JUnit">
+ <module name="action"/>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
+ <option name="ALTERNATIVE_JRE_PATH" value=""/>
+ <option name="PACKAGE_NAME" value="org.apache.struts.action2"/>
+ <option name="MAIN_CLASS_NAME" value=""/>
+ <option name="METHOD_NAME" value=""/>
+ <option name="TEST_OBJECT" value="package"/>
+ <option name="VM_PARAMETERS" value=""/>
+ <option name="PARAMETERS" value=""/>
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$"/>
+ <option name="ADDITIONAL_CLASS_PATH"/>
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule"/>
+ </option>
+ <RunnerSettings RunnerId="Run"/>
+ <ConfigurationWrapper RunnerId="Run"/>
+ </configuration>
+ <configuration selected="true" default="false" name="Showcase"
type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME"
value="org.apache.struts.action2.Main"/>
+ <option name="VM_PARAMETERS" value=""/>
+ <option name="PROGRAM_PARAMETERS" value="quickstart"/>
+ <option name="WORKING_DIRECTORY"
value="file://$PROJECT_DIR$/webapps/showcase"/>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
+ <option name="ALTERNATIVE_JRE_PATH" value=""/>
+ <module name="webapp-showcase"/>
+ <RunnerSettings RunnerId="Run"/>
+ <ConfigurationWrapper RunnerId="Run"/>
+ </configuration>
+ </component>
</project>
Modified: incubator/webwork2/webapps/showcase/quickstart.xml
URL:
http://svn.apache.org/viewcvs/incubator/webwork2/webapps/showcase/quickstart.xml?rev=396750&r1=396749&r2=396750&view=diff
==============================================================================
--- incubator/webwork2/webapps/showcase/quickstart.xml (original)
+++ incubator/webwork2/webapps/showcase/quickstart.xml Mon Apr 24 17:49:33 2006
@@ -12,7 +12,7 @@
users who don't have a single directory in their project that
contains all the libraries they need.
-->
-
<ideaConfig>../../action/action.iml,../../thirdparty/jasperreports/action-jasperreports.iml,webapp-showcase.iml</ideaConfig>
+
<ideaConfig>../../../xwork/xwork.iml,../../action/action.iml,../../thirdparty/jasperreports/action-jasperreports.iml,webapp-showcase.iml</ideaConfig>
<!-- The context in which to deploy the web application -->
<context>/showcase</context>
@@ -35,10 +35,10 @@
has been known to cause strange side effects. If you don't
specify your sources, you must specify where your classes are by
using the classDirs and libs elements
- -->
<sources>
<dir>src/main/java</dir>
</sources>
+ -->
<!--
The classDirs directories can be a jar or a directory of classes
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
