You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2008/05/24 17:28:37 UTC
svn commit: r659838 - in
/struts/sandbox/trunk/struts2-osgi-plugin/plugin/src:
main/resources/struts-osgi.properties
test/java/org/apache/struts2/osgi/OsgiConfigurationProviderTest.java
Author: mrdon
Date: Sat May 24 08:28:36 2008
New Revision: 659838
URL: http://svn.apache.org/viewvc?rev=659838&view=rev
Log:
Added servlets to scanning, more tests, tweaking scanning settings
Modified:
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/main/resources/struts-osgi.properties
struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/OsgiConfigurationProviderTest.java
Modified: struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/main/resources/struts-osgi.properties
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/main/resources/struts-osgi.properties?rev=659838&r1=659837&r2=659838&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/main/resources/struts-osgi.properties (original)
+++ struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/main/resources/struts-osgi.properties Sat May 24 08:28:36 2008
@@ -22,9 +22,10 @@
scanning.jar.includes = *.jar
scanning.jar.excludes =
-scanning.package.includes = com.opensymphony.xwork2.*, \
- org.apache.struts2.*, \
- ognl.*, \
- freemarker.*, \
- org.apache.velocity.*
+scanning.package.includes = com.opensymphony.xwork2*, \
+ org.apache.struts2*, \
+ ognl*, \
+ freemarker*, \
+ org.apache.velocity*, \
+ javax.servlet*
scanning.package.excludes =
Modified: struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/OsgiConfigurationProviderTest.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/OsgiConfigurationProviderTest.java?rev=659838&r1=659837&r2=659838&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/OsgiConfigurationProviderTest.java (original)
+++ struts/sandbox/trunk/struts2-osgi-plugin/plugin/src/test/java/org/apache/struts2/osgi/OsgiConfigurationProviderTest.java Sat May 24 08:28:36 2008
@@ -17,9 +17,11 @@
OsgiConfigurationProvider prov = new OsgiConfigurationProvider();
Properties props = new Properties();
props.setProperty("scanning.jar.includes", "*.jar");
- props.setProperty("scanning.package.includes", "com.opensymphony.xwork2.*, org.apache.struts2.*,ognl.*,freemarker.*, org.apache.velocity.*");
+ props.setProperty("scanning.package.includes", "com.opensymphony.xwork2*, org.apache.struts2*,ognl*,freemarker*, org.apache.velocity*, javax.servlet*");
String export = prov.getScannedPackages(props);
assertNotNull(export);
+ assertTrue(export.contains("javax.servlet;"));
+ assertTrue(export.contains("javax.servlet.http;"));
assertTrue(export.length() > 20);
}