[CONF] Confluence Changes in the last 24 hours

2009-02-12 Thread confluence
-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

OpenJPA (openjpa) http://cwiki.apache.org/confluence/display/openjpa
|
|-Pages Added or Edited in This Space
 |-- JPA 2.0 Roadmap was last edited by ppod...@apache.org (09:26 AM).
 |   http://cwiki.apache.org/confluence/display/openjpa/JPA+2.0+Roadmap

Apache Camel (CAMEL) http://cwiki.apache.org/confluence/display/CAMEL
|
|-Pages Added or Edited in This Space
 |-- Camel 1.6.0 Release was last edited by davsclaus (08:52 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Camel+1.6.0+Release
 |-- Camel 2.0 Design was last edited by davsclaus (05:17 AM).
 |   http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.0+Design

Apache Directory Server v1.5 (DIRxSRVx11) 
http://cwiki.apache.org/confluence/display/DIRxSRVx11
|
|-Pages Added or Edited in This Space
 |-- Core Integration Testing Framework was last edited by elecharny (04:31 AM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSRVx11/Core+Integration+Testing+Framework

Apache Geronimo Project Management (GMOxPMGT) 
http://cwiki.apache.org/confluence/display/GMOxPMGT
|
|-Pages Added or Edited in This Space
 |-- Geronimo 2.1.4 Release Status was last edited by gawor (12:14 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+2.1.4+Release+Status

Apache Shindig (SHINDIG) http://cwiki.apache.org/confluence/display/SHINDIG
|
|-Pages Added or Edited in This Space
 |-- Index was last edited by vsiveton (09:01 AM).
 |   http://cwiki.apache.org/confluence/display/SHINDIG/Index

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
|
|-Pages Added or Edited in This Space
 |-- bind was last edited by musachy (12:40 PM).
 |   http://cwiki.apache.org/confluence/display/WW/bind
 |-- Convention Plugin was last edited by musachy (08:06 AM).
 |   http://cwiki.apache.org/confluence/display/WW/Convention+Plugin
 |
 |-New Comments in This Space
 |-- http://cwiki.apache.org/confluence/display/WW/Convention+Plugin (1)

Apache VCL (VCL) http://cwiki.apache.org/confluence/display/VCL
|
|-Pages Added or Edited in This Space
 |-- Provisioning Engine Module Interface Specification was created by arkurth 
(11:38 AM).
 |   
http://cwiki.apache.org/confluence/display/VCL/Provisioning+Engine+Module+Interface+Specification
 |-- Development Documentation was created by arkurth (12:00 PM).
 |   http://cwiki.apache.org/confluence/display/VCL/Development+Documentation
 |-- Operating System Module Interface Specification was created by arkurth 
(10:03 AM).
 |   
http://cwiki.apache.org/confluence/display/VCL/Operating+System+Module+Interface+Specification

Apache Felix (FELIX) http://cwiki.apache.org/confluence/display/FELIX
|
|-Pages Added or Edited in This Space
 |-- iPOJO Composition Tutorial was last edited by clement.escoffier (11:59 PM).
 |   http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Composition+Tutorial
 |-- How to use iPOJO Annotations was last edited by clement.escoffier (11:57 
PM).
 |   
http://cwiki.apache.org/confluence/display/FELIX/How+to+use+iPOJO+Annotations
 |-- iPOJO Advanced Tutorial was last edited by clement.escoffier (11:57 PM).
 |   http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Advanced+Tutorial
 |-- Download was last edited by clement.escoffier (11:40 PM).
 |   http://cwiki.apache.org/confluence/display/FELIX/Download
 |-- Apache Felix iPOJO was last edited by clement.escoffier (11:37 PM).
 |   http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+iPOJO
 |-- Apache Felix iPOJO Feature Overview was last edited by clement.escoffier 
(05:39 AM).
 |   
http://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+iPOJO+Feature+Overview
 |-- apache-felix-ipojo-why-choose-ipojo was last edited by clement.escoffier 
(05:37 AM).
 |   
http://cwiki.apache.org/confluence/display/FELIX/apache-felix-ipojo-why-choose-ipojo
 |-- iPOJO Hello Word (Maven-Based) tutorial was last edited by 
clement.escoffier (12:17 AM).
 |   
http://cwiki.apache.org/confluence/display/FELIX/iPOJO+Hello+Word+%28Maven-Based%29+tutorial

Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid
|
|-Pages Added or Edited in This Space
 |-- .NET Client was created by rajith (09:37 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/.NET+Client
 |-- Management Tools Overview was created by rajith (09:35 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/Management+Tools+Overview
 |-- DocumentationB was last edited by rajith (09:32 AM).
 |   http://cwiki.apache.org/confluence/display/qpid/DocumentationB
 |-- C++ Broker was created by rajith (08:42 AM).
 |   http://cwiki.apache.org/confluence/pages/viewpage.action?pageId=109908
 |-- Ruby Client was created by rajith (09:25 AM).
 |   http://cwiki.apache.org/con

svn commit: r743777 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java

2009-02-12 Thread musachy
Author: musachy
Date: Thu Feb 12 15:19:05 2009
New Revision: 743777

URL: http://svn.apache.org/viewvc?rev=743777&view=rev
Log:
WW-2982 add jspx files as a possible view to Convention plugin

Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java?rev=743777&r1=743776&r2=743777&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
 Thu Feb 12 15:19:05 2009
@@ -109,9 +109,9 @@
 
 Map resultsByExtension = new HashMap();
 resultsByExtension.put("jsp", results.get("dispatcher"));
+resultsByExtension.put("jspx", results.get("dispatcher"));
 resultsByExtension.put("vm", results.get("velocity"));
 resultsByExtension.put("ftl", results.get("freemarker"));
-// Issue 22 - Add html and htm as default result extensions
 resultsByExtension.put("html", results.get("dispatcher"));
 resultsByExtension.put("htm", results.get("dispatcher"));
 return resultsByExtension;




[OSS Bamboo] Struts 2 SVN - Main Build (Java 6) build 735 was SUCCESSFUL (with 960 tests). Change made by Musachy Barroso

2009-02-12 Thread bamboo
---
STRUTS-MAINJ6-735 was successful.
---
Code has been updated by Musachy Barroso.
960 tests in total.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAINJ6-735/


--
Code Changes
--
Musachy Barroso (743777):

>WW-2982 add jspx files as a possible view to Convention plugin


--
Error Summary
--
        [copy] Warning: 
/home/j2ee/xml-data/build-dir/STRUTS-MAINJ6/apps/src/main/java not found.
        [copy] Warning: 
/home/j2ee/xml-data/build-dir/STRUTS-MAINJ6/apps/src/main/resources not found.


--
This message is automatically generated by Atlassian Bamboo



[OSS Bamboo] Struts 2 SVN - Main Build build 1024 was SUCCESSFUL (with 960 tests). Change made by Musachy Barroso

2009-02-12 Thread bamboo
---
STRUTS-MAIN-1024 was successful.
---
Code has been updated by Musachy Barroso.
960 tests in total.

http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1024/


--
Code Changes
--
Musachy Barroso (743777):

>WW-2982 add jspx files as a possible view to Convention plugin


--
Error Summary
--
   warning: Annotation types without processors: [java.lang.Override, 
com.opensymphony.xwork2.inject.Inject, java.lang.SuppressWarnings, 
java.lang.annotation.Target, java.lang.annotation.Retention]
   Note: Some input files use or override a deprecated API.
   Note: Recompile with -Xlint:deprecation for details.
   1 warning
        [copy] Warning: 
/home/j2ee/xml-data/build-dir/STRUTS-MAIN/apps/src/main/java not found.
        [copy] Warning: 
/home/j2ee/xml-data/build-dir/STRUTS-MAIN/apps/src/main/resources not found.
   warning: Annotation types without processors: [java.lang.Override, 
java.lang.Deprecated]
   1 warning


--
This message is automatically generated by Atlassian Bamboo



svn commit: r743781 - /struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java

2009-02-12 Thread musachy
Author: musachy
Date: Thu Feb 12 15:37:19 2009
New Revision: 743781

URL: http://svn.apache.org/viewvc?rev=743781&view=rev
Log:
WW-2775 refactor class instantiation decision to a protected method

Thanks to Richard Wallace for patch

Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=743781&r1=743780&r2=743781&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
 Thu Feb 12 15:37:19 2009
@@ -413,9 +413,8 @@
 Map packageConfigs = new 
HashMap();
 
 for (Class actionClass : classes) {
-// Skip all interfaces, enums, annotations, and abstract classes
-if (actionClass.isAnnotation() || actionClass.isInterface() || 
actionClass.isEnum() ||
-(actionClass.getModifiers() & Modifier.ABSTRACT) != 0) {
+// Skip classes that can't be instantiated
+if (cannotInstantiate(actionClass)) {
 continue;
 }
 
@@ -508,6 +507,14 @@
 }
 
 /**
+ * Interfaces, enums, annotations, and abstract classes cannot be 
instantiated.
+ */
+protected boolean cannotInstantiate(Class actionClass) {
+return actionClass.isAnnotation() || actionClass.isInterface() || 
actionClass.isEnum() ||
+(actionClass.getModifiers() & Modifier.ABSTRACT) != 0;
+}
+
+/**
  * Determines the namespace(s) for the action based on the action class. 
If there is a {...@link Namespace}
  * annotation on the class (including parent classes) or on the package 
that the class is in, than
  * it is used. Otherwise, the Java package name that the class is in is 
used in conjunction with




svn commit: r743811 - in /struts/struts2/trunk/plugins/convention/src: main/java/org/apache/struts2/convention/ test/java/org/apache/struts2/convention/ test/java/org/apache/struts2/convention/actions

2009-02-12 Thread musachy
Author: musachy
Date: Thu Feb 12 17:13:21 2009
New Revision: 743811

URL: http://svn.apache.org/viewvc?rev=743811&view=rev
Log:
WW-2990 support result inheritance

Added:

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/InheritedResultExtends.java
   (contents, props changed)
  - copied, changed from r734776, 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/action/TestExtends.java

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/InheritedResultTestBase.java
   (contents, props changed)
  - copied, changed from r734776, 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/action/TestBase.java

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/InheritedResultsExtends.java

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/InheritedResultsTestBase.java

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/OverrideInheritedResultExtends.java

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/OverrideInheritedResultTestBase.java
Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ReflectionTools.java

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java?rev=743811&r1=743810&r2=743811&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultResultMapBuilder.java
 Thu Feb 12 17:13:21 2009
@@ -188,21 +188,33 @@
 actionClass, resultsByExtension);
 }
 
+//get inherited @Results and @Result
+for (Class clazz : ReflectionTools.getClassHierarchy(actionClass)) {
+createResultsFromAnnotations(clazz, packageConfig, 
defaultResultPath, results, resultsByExtension);
+}
+
+return results;
+}
+
+/**
+ * Creates results from @Results and @Result annotations
+ */
+protected void createResultsFromAnnotations(Class actionClass, 
PackageConfig packageConfig, String defaultResultPath,
+Map 
results, Map resultsByExtension) {
 Results resultsAnn = actionClass.getAnnotation(Results.class);
 if (resultsAnn != null) {
 createFromAnnotations(results, defaultResultPath, packageConfig, 
resultsAnn.value(),
-actionClass, resultsByExtension);
+actionClass, resultsByExtension);
 }
 
 Result resultAnn = actionClass.getAnnotation(Result.class);
 if (resultAnn != null) {
 createFromAnnotations(results, defaultResultPath, packageConfig, 
new Result[]{resultAnn},
-actionClass, resultsByExtension);
+actionClass, resultsByExtension);
 }
-
-return results;
 }
 
+
 /**
  * Creates any result types from the resources available in the web 
application. This scans the
  * web application resources using the servlet context.

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ReflectionTools.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ReflectionTools.java?rev=743811&r1=743810&r2=743811&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ReflectionTools.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ReflectionTools.java
 Thu Feb 12 17:13:21 2009
@@ -22,6 +22,8 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
+import java.util.List;
+import java.util.ArrayList;
 
 /**
  * 
@@ -62,4 +64,19 @@
 throw new RuntimeException(e);
 }
 }
+
+/**
+ * Return the list of parent classes in order (Object will be at index 0)
+   

svn commit: r743831 - in /struts/struts2/trunk/plugins/convention/src/main: java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java resources/struts-plugin.xml

2009-02-12 Thread musachy
Author: musachy
Date: Thu Feb 12 18:45:14 2009
New Revision: 743831

URL: http://svn.apache.org/viewvc?rev=743831&view=rev
Log:
Add a setting so file protocols can be set by a constant

Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=743831&r1=743830&r2=743831&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
 Thu Feb 12 18:45:14 2009
@@ -63,6 +63,7 @@
 import com.opensymphony.xwork2.util.logging.LoggerFactory;
 import com.opensymphony.xwork2.util.FileManager;
 import com.opensymphony.xwork2.util.TextUtils;
+import com.opensymphony.xwork2.util.TextParseUtil;
 
 /**
  * 
@@ -92,6 +93,7 @@
 private boolean devMode;
 private ReloadingClassLoader reloadingClassLoader;
 private boolean reload;
+private Set fileProtocols;
 
 /**
  * Constructs actions based on a list of packages.
@@ -137,6 +139,17 @@
 }
 
 /**
+ * Comma separated list of file protocols that will be considered as jar 
files and scanned
+ * @param fileProtocols
+ */
+@Inject("struts.convention.action.fileProtocols")
+public void setFileProtocols(String fileProtocols) {
+if (!StringTools.isTrimmedEmpty(fileProtocols)) {
+this.fileProtocols = 
TextParseUtil.commaDelimitedStringToSet(fileProtocols);
+}
+}
+
+/**
  * @param disableActionScanning Disable scanning for actions
  */
 @Inject(value = "struts.convention.action.disableScanning", required = 
false)
@@ -332,7 +345,7 @@
 boolean[] patternUsed = new boolean[includeJars.length];
 
 for (URL url : rawIncludedUrls) {
-if ("jar".equalsIgnoreCase(url.getProtocol())) {
+if (fileProtocols.contains(url.getProtocol())) {
 //it is a jar file, make sure it macthes at least a url 
regex
 for (int i = 0; i < includeJars.length; i++) {
 String includeJar = includeJars[i];

Modified: 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml?rev=743831&r1=743830&r2=743831&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml 
(original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/resources/struts-plugin.xml 
Thu Feb 12 18:45:14 2009
@@ -60,7 +60,8 @@
   
   
   
-
+  
+  
 
 
 




svn commit: r743883 - in /struts/struts2/trunk/plugins/convention/src: main/java/org/apache/struts2/convention/ main/java/org/apache/struts2/convention/classloader/ test/java/org/apache/struts2/conven

2009-02-12 Thread musachy
Author: musachy
Date: Thu Feb 12 21:06:41 2009
New Revision: 743883

URL: http://svn.apache.org/viewvc?rev=743883&view=rev
Log:
Cleanup some warnings

Modified:

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/classloader/ResourceStore.java

struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/classloader/ResourceStoreClassLoader.java

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java?rev=743883&r1=743882&r2=743883&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/ClasspathConfigurationProvider.java
 Thu Feb 12 21:06:41 2009
@@ -94,10 +94,11 @@
 }
 
 /**
+ * Depends on devMode, relead and actionConfigBuilder.needsReload()
  * @return Always false.
  */
 public boolean needsReload() {
-return devMode && reload ? actionConfigBuilder.needsReload() : false;
+return devMode && reload && actionConfigBuilder.needsReload();
 }
 
 public void dispatcherInitialized(Dispatcher du) {

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java?rev=743883&r1=743882&r2=743883&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/DefaultInterceptorMapBuilder.java
 Thu Feb 12 21:06:41 2009
@@ -98,7 +98,7 @@
PackageConfig.Builder builder, InterceptorRef ref, Map 
params) {
return 
InterceptorBuilder.constructInterceptorReference(builder, ref
.value(), params, builder.build().getLocation(),
-   (ObjectFactory) 
configuration.getContainer().getInstance(
+configuration.getContainer().getInstance(
ObjectFactory.class));
}
 

Modified: 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=743883&r1=743882&r2=743883&view=diff
==
--- 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
 (original)
+++ 
struts/struts2/trunk/plugins/convention/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
 Thu Feb 12 21:06:41 2009
@@ -45,6 +45,7 @@
 import org.apache.struts2.convention.annotation.ParentPackage;
 import org.apache.struts2.convention.classloader.ReloadingClassLoader;
 import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.StrutsException;
 
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.config.Configuration;
@@ -117,7 +118,7 @@
 this.configuration = configuration;
 this.actionNameBuilder = 
container.getInstance(ActionNameBuilder.class, 
container.getInstance(String.class, 
ConventionConstants.CONVENTION_ACTION_NAME_BUILDER));
 this.resultMapBuilder = container.getInstance(ResultMapBuilder.class, 
container.getInstance(String.class, 
ConventionConstants.CONVENTION_RESULT_MAP_BUILDER));
-this.interceptorMapBuilder = 
container.getInstance(InterceptorMapBuilder.class, 
container.getInstance(String.class, 
ConventionConstants.CONVENTION_INTERCEPTOR_MAP_BUILDER));;
+this.interceptorMapBuilder = 
container.getInstance(InterceptorMapBuilder.class, 
container.getInstance(String.class, 
ConventionConstants.CON

svn commit: r743911 - /struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/

2009-02-12 Thread musachy
Author: musachy
Date: Thu Feb 12 22:39:16 2009
New Revision: 743911

URL: http://svn.apache.org/viewvc?rev=743911&view=rev
Log:
Set svn Id property

Modified:

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/InheritedResultsExtends.java
   (props changed)

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/InheritedResultsTestBase.java
   (props changed)

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/OverrideInheritedResultExtends.java
   (props changed)

struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/OverrideInheritedResultTestBase.java
   (props changed)

Propchange: 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/InheritedResultsExtends.java
--
svn:keywords = Id

Propchange: 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/InheritedResultsTestBase.java
--
svn:keywords = Id

Propchange: 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/OverrideInheritedResultExtends.java
--
svn:keywords = Id

Propchange: 
struts/struts2/trunk/plugins/convention/src/test/java/org/apache/struts2/convention/actions/result/OverrideInheritedResultTestBase.java
--
svn:keywords = Id