date:20120427

svn commit: r1331339 - /struts/struts2/trunk/core/pom.xml

2012-04-27 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Apr 27 10:22:26 2012
New Revision: 1331339

URL: http://svn.apache.org/viewvc?rev=1331339&view=rev
Log:
Updated tag version and name

Modified:
struts/struts2/trunk/core/pom.xml

Modified: struts/struts2/trunk/core/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=1331339&r1=1331338&r2=1331339&view=diff
==
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Fri Apr 27 10:22:26 2012
@@ -40,7 +40,7 @@
 
 
 
-2.2
+2.3
 
 
 
@@ -50,7 +50,7 @@
 maven-apt-plugin
 1.0.15
 
-
uri=/struts-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=s,displayName="Struts
 Tags",
+
uri=/struts-tags,tlibVersion=${tlib.version},jspVersion=2.0,shortName=s,displayName=Struts
 Tags,
 
outFile=${basedir}/target/classes/META-INF/struts-tags.tld,
 description="To make it easier to access dynamic data;
 the Apache Struts framework includes a library of 
custom tags.

svn commit: r1331373 - in /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util: URLUtil.java finder/UrlSet.java

2012-04-27 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Apr 27 12:12:03 2012
New Revision: 1331373

URL: http://svn.apache.org/viewvc?rev=1331373&view=rev
Log:
WW-3803 improves support for JAR inside EAR package when used with JBoss 7

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java?rev=1331373&r1=1331372&r2=1331373&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/URLUtil.java
 Fri Apr 27 12:12:03 2012
@@ -23,6 +23,8 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -123,8 +125,7 @@ public class URLUtil {
 Object content = url.openConnection().getContent();
 try {
 if (content.getClass().toString().startsWith("class 
org.jboss.vfs.VirtualFile")) {
-Method method = 
content.getClass().getDeclaredMethod("getPhysicalFile");
-File physicalFile = (File) method.invoke(content);
+File physicalFile = readJBossPhysicalFile(content);
 return physicalFile.toURI().toURL();
 }
 } catch (Exception e) {
@@ -133,4 +134,44 @@ public class URLUtil {
 return url;
 }
 
+public static List getAllJBossPhysicalUrls(URL url) throws 
IOException {
+List urls = new ArrayList();
+Object content = url.openConnection().getContent();
+try {
+if (content.getClass().toString().startsWith("class 
org.jboss.vfs.VirtualFile")) {
+File physicalFile = readJBossPhysicalFile(content);
+readFile(urls, physicalFile);
+readFile(urls, physicalFile.getParentFile());
+} else {
+urls.add(url);
+}
+} catch (Exception e) {
+LOG.warn("Error calling getPhysicalFile() on JBoss VirtualFile.", 
e);
+}
+return urls;
+}
+
+private static File readJBossPhysicalFile(Object content) throws Exception 
{
+Method method = 
content.getClass().getDeclaredMethod("getPhysicalFile");
+return (File) method.invoke(content);
+}
+
+private static void readFile(List urls, File physicalFile) throws 
MalformedURLException {
+if (physicalFile.isDirectory()) {
+for (File file : physicalFile.listFiles()) {
+if (file.isFile()) {
+addIfAbsent(urls, file.toURI().toURL());
+} else if (file.isDirectory()) {
+readFile(urls, file);
+}
+}
+}
+}
+
+private static void addIfAbsent(List urls, URL fileUrl) {
+if (!urls.contains(fileUrl)) {
+urls.add(fileUrl);
+}
+}
+
 }

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java?rev=1331373&r1=1331372&r2=1331373&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/finder/UrlSet.java
 Fri Apr 27 12:12:03 2012
@@ -264,7 +264,7 @@ public class UrlSet {
 ArrayList classesList = 
Collections.list(classLoader.getResources(""));
 for (URL url : classesList) {
 if (URLUtil.isJBossUrl(url)) {
-list.add(URLUtil.getJBossPhysicalUrl(url));
+list.addAll(URLUtil.getAllJBossPhysicalUrls(url));
 } else {
 list.add(url);
 }

svn commit: r1331402 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java

2012-04-27 Thread lukaszlenart

Author: lukaszlenart
Date: Fri Apr 27 12:56:02 2012
New Revision: 1331402

URL: http://svn.apache.org/viewvc?rev=1331402&view=rev
Log:
WW-3805 solves problem with reloading configuration on each request even no 
changes to file

Modified:

struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java

Modified: 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java?rev=1331402&r1=1331401&r2=1331402&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java
 Fri Apr 27 12:56:02 2012
@@ -34,7 +34,8 @@ public class DefaultFileManager implemen
 
 private static Logger LOG = 
LoggerFactory.getLogger(DefaultFileManager.class);
 
-private Map files = Collections.synchronizedMap(new 
HashMap());
+private static Map files = 
Collections.synchronizedMap(new HashMap());
+
 protected boolean reloadingConfigs = true;
 
 static final String JAR_FILE_NAME_SEPARATOR = "!/";

[CONF] Confluence Changes in the last 24 hours

2012-04-27 Thread confluence

This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-


Apache ActiveMQ (https://cwiki.apache.org/confluence/display/ACTIVEMQ)

Pages
-
Index edited by  tabish121  (09:13 AM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/Index

ActiveMQ-CPP Version 3.4.2 Released created by tabish121 (09:11 AM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/2012/04/27/ActiveMQ-CPP+Version+3.4.2+Released

StatisticsPlugin edited by  dejanb  (08:16 AM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/StatisticsPlugin

Integrating Apache ActiveMQ with Glassfish edited by  cathodion  (03:21 AM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/Integrating+Apache+ActiveMQ+with+Glassfish



Apache Airavata (https://cwiki.apache.org/confluence/display/AIRAVATA)

Pages
-
Index created by uli (08:52 AM)
https://cwiki.apache.org/confluence/display/AIRAVATA/Index



Apache ActiveMQ CPP (https://cwiki.apache.org/confluence/display/AMQCPP)

Pages
-
ActiveMQ-CPP Version 3.4.2 Released created by tabish121 (09:07 AM)
https://cwiki.apache.org/confluence/display/AMQCPP/2012/04/27/ActiveMQ-CPP+Version+3.4.2+Released

Download edited by  tabish121  (09:07 AM)
https://cwiki.apache.org/confluence/display/AMQCPP/Download

ActiveMQ-CPP 3.4.2 Release edited by  tabish121  (09:06 AM)
https://cwiki.apache.org/confluence/display/AMQCPP/ActiveMQ-CPP+3.4.2+Release



Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL)

Pages
-
Scala DSL - Getting Started edited by  rubytuesdaydono  (07:27 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Scala+DSL+-+Getting+Started

Scala DSL edited by  rubytuesdaydono  (01:36 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Scala+DSL

Scala DSL - Supported languages edited by  rubytuesdaydono  (12:57 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Scala+DSL+-+Supported+languages

Camel 2.10.0 Release edited by  bvahdat  (12:53 PM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.10.0+Release

JMS edited by  davsclaus  (11:04 AM)
https://cwiki.apache.org/confluence/display/CAMEL/JMS

CSV edited by  bvahdat  (09:01 AM)
https://cwiki.apache.org/confluence/display/CAMEL/CSV

Zookeeper edited by  davsclaus  (02:40 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Zookeeper



Apache DeltaSpike (https://cwiki.apache.org/confluence/display/DeltaSpike)

Pages
-
Temporary Documentation edited by  lightguard.jp  (02:01 PM)
https://cwiki.apache.org/confluence/display/DeltaSpike/Temporary+Documentation



Apache Flume (https://cwiki.apache.org/confluence/display/FLUME)

Pages
-
Index edited by  mpercy  (07:32 PM)
https://cwiki.apache.org/confluence/display/FLUME/Index



Apache Kafka (https://cwiki.apache.org/confluence/display/KAFKA)

Pages
-
kafka Detailed Replication Design V3 edited by  nehanarkhede  (03:09 PM)
https://cwiki.apache.org/confluence/display/KAFKA/kafka+Detailed+Replication+Design+V3



OFBiz Project Administration Workspace 
(https://cwiki.apache.org/confluence/display/OFBADMIN)

Pages
-
Mini-language Reference edited by  adrianc  (09:49 AM)
https://cwiki.apache.org/confluence/display/OFBADMIN/Mini-language+Reference



OFBiz (Open For Business) Project Open Wiki 
(https://cwiki.apache.org/confluence/display/OFBIZ)

Pages
-
Apache OFBiz User List edited by  jacques.le.roux  (03:29 PM)
https://cwiki.apache.org/confluence/display/OFBIZ/Apache+OFBiz+User+List

FAQ - Tips - Tricks - Cookbook - HowTo edited by  jacques.le.roux  (07:44 AM)
https://cwiki.apache.org/confluence/display/OFBIZ/FAQ+-+Tips+-+Tricks+-+Cookbook+-+HowTo

How to migrate OfBiz from Derby to MySQL database created by ak_avinash (06:53 
AM)
https://cwiki.apache.org/confluence/display/OFBIZ/How+to+migrate+OfBiz+from+Derby+to+MySQL+database



OODT (https://cwiki.apache.org/confluence/display/OODT)

Pages
-
Custom crawling - when to or when not to write your own ProductCrawler created 
by rishi.ve...@jpl.nasa.gov (02:15 PM)
https://cwiki.apache.org/confluence/display/OODT/2012/04/27/Custom+crawling+-+when+to+or+when+not+to+write+your+own+ProductCrawler



Apache OpenOffice Community 
(https://cwiki.apache.org/confluence/display/OOOUSERS)

Pages
-

svn commit: r1331339 - /struts/struts2/trunk/core/pom.xml

svn commit: r1331373 - in /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util: URLUtil.java finder/UrlSet.java

svn commit: r1331402 - /struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/fs/DefaultFileManager.java

[CONF] Confluence Changes in the last 24 hours

4 matches

Site Navigation

Mail list logo

Footer information