You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2009/04/24 19:29:41 UTC
svn commit: r768377 - in /struts/struts2/trunk/plugins/osgi/src/main:
java/org/apache/struts2/osgi/FelixOsgiHost.java
resources/struts-osgi.properties
Author: musachy
Date: Fri Apr 24 17:29:40 2009
New Revision: 768377
URL: http://svn.apache.org/viewvc?rev=768377&view=rev
Log:
Add version option to properties
Modified:
struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java
struts/struts2/trunk/plugins/osgi/src/main/resources/struts-osgi.properties
Modified: struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java?rev=768377&r1=768376&r2=768377&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java (original)
+++ struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/FelixOsgiHost.java Fri Apr 24 17:29:40 2009
@@ -295,11 +295,20 @@
//build a list of subpackages
for (String rootPackage : rootPackages) {
try {
+ String version = null;
+ if (rootPackage.indexOf(";") > 0) {
+ String[] splitted = rootPackage.split(";");
+ rootPackage = splitted[0];
+ version = splitted[1];
+ }
Map<URL, Set<String>> subpackagesMap = finder.findPackagesMap(StringUtils.replace(rootPackage.trim(), ".", "/"));
for (Map.Entry<URL, Set<String>> entry : subpackagesMap.entrySet()) {
URL url = entry.getKey();
Set<String> packages = entry.getValue();
- String version = getVersion(url);
+
+ //get version if not set
+ if (StringUtils.isBlank(version))
+ version = getVersion(url);
if (packages != null) {
for (String subpackage : packages) {
Modified: struts/struts2/trunk/plugins/osgi/src/main/resources/struts-osgi.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/src/main/resources/struts-osgi.properties?rev=768377&r1=768376&r2=768377&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/osgi/src/main/resources/struts-osgi.properties (original)
+++ struts/struts2/trunk/plugins/osgi/src/main/resources/struts-osgi.properties Fri Apr 24 17:29:40 2009
@@ -21,5 +21,5 @@
ognl, \
freemarker, \
org.apache.velocity, \
- javax.servlet
+ javax.servlet;2.4