Author: plightbo
Date: Tue Aug 1 17:11:15 2006
New Revision: 427809
URL: http://svn.apache.org/viewvc?rev=427809&view=rev
Log:
quickstart works with multiple idea configurations (i thought this already
worked - perhaps not)
Modified:
struts/struts2/trunk/apps/showcase/quickstart.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/quickstart/Configuration.java
struts/struts2/trunk/src/main/idea/workspace.xml
Modified: struts/struts2/trunk/apps/showcase/quickstart.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/quickstart.xml?rev=427809&r1=427808&r2=427809&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/quickstart.xml (original)
+++ struts/struts2/trunk/apps/showcase/quickstart.xml Tue Aug 1 17:11:15 2006
@@ -12,7 +12,7 @@
users who don't have a single directory in their project that
contains all the libraries they need.
-->
-
<ideaConfig>../../../../xwork/xwork.iml,../../core/struts2-core.iml,struts2-showcase.iml</ideaConfig>
+
<ideaConfig>../../../xwork/xwork.iml,../../core/struts2-core.iml,../../extras/struts2-extras.iml,struts2-showcase.iml</ideaConfig>
<!-- The context in which to deploy the web application -->
<context>/showcase</context>
@@ -23,10 +23,10 @@
<!--
The libs directories can be a jar, a directory of jars, or even
a directory of directories (searched recursively)
- -->
<libs>
<dir>../../lib</dir>
</libs>
+ -->
<!--
Optional: the location where your source files are. If this is
@@ -46,6 +46,7 @@
<classDirs>
<dir>src/main/resources</dir>
<dir>../../core/target/classes</dir>
+ <dir>../../extras/target/classes</dir>
</classDirs>
<!--
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/quickstart/Configuration.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/quickstart/Configuration.java?rev=427809&r1=427808&r2=427809&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/quickstart/Configuration.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/quickstart/Configuration.java
Tue Aug 1 17:11:15 2006
@@ -132,32 +132,35 @@
public void resolveDirs(String wd) {
if (ideaConfig != null) {
- String full = resolveDir(this.ideaConfig, wd);
+ String[] paths = ideaConfig.split(",");
+ for (String path : paths) {
+ String full = resolveDir(path, wd);
- try {
- DocumentBuilder db =
DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = db.parse(full);
- NodeList components = doc.getElementsByTagName("root");
- List jars = new ArrayList();
- for (int i = 0; i < components.getLength(); i++) {
- Element e = (Element) components.item(i);
- String value = e.getAttribute("url");
- if (value != null && value.startsWith("jar://") &&
value.endsWith(".jar!/")) {
- value = value.substring(6, value.length() - 2);
- if (value.startsWith("$MODULE_DIR$")) {
- value = value.substring(13);
+ try {
+ DocumentBuilder db =
DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ Document doc = db.parse(full);
+ NodeList components = doc.getElementsByTagName("root");
+ List jars = new ArrayList();
+ for (int i = 0; i < components.getLength(); i++) {
+ Element e = (Element) components.item(i);
+ String value = e.getAttribute("url");
+ if (value != null && value.startsWith("jar://") &&
value.endsWith(".jar!/")) {
+ value = value.substring(6, value.length() - 2);
+ if (value.startsWith("$MODULE_DIR$")) {
+ value = value.substring(13);
+ }
+ jars.add(value);
}
- jars.add(value);
}
- }
- if (this.libs != null) {
- this.libs.addAll(jars);
- } else {
- this.libs = jars;
+ if (this.libs != null) {
+ this.libs.addAll(jars);
+ } else {
+ this.libs = jars;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
- } catch (Exception e) {
- e.printStackTrace();
}
}
resolve(this.libs, wd);
Modified: struts/struts2/trunk/src/main/idea/workspace.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/src/main/idea/workspace.xml?rev=427809&r1=427808&r2=427809&view=diff
==============================================================================
--- struts/struts2/trunk/src/main/idea/workspace.xml (original)
+++ struts/struts2/trunk/src/main/idea/workspace.xml Tue Aug 1 17:11:15 2006
@@ -47,7 +47,7 @@
<option name="ALTERNATIVE_JRE_PATH"/>
</configuration>
<configuration selected="true" default="false" name="Struts Core
Tests" type="JUnit" factoryName="JUnit">
- <module name="struts-core"/>
+ <module name="struts2-core"/>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
<option name="ALTERNATIVE_JRE_PATH" value=""/>
<option name="PACKAGE_NAME" value="org.apache.struts2"/>
@@ -72,7 +72,7 @@
<option name="WORKING_DIRECTORY"
value="file://$PROJECT_DIR$/apps/showcase"/>
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false"/>
<option name="ALTERNATIVE_JRE_PATH" value=""/>
- <module name="struts-showcase"/>
+ <module name="struts2-showcase"/>
</configuration>
</component>
</project>
