date:20110919

svn commit: r1172492 - in /struts/struts2/trunk: apps/blank/ plugins/cdi/pom.xml plugins/pom.xml pom.xml

2011-09-19 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Sep 19 07:02:17 2011
New Revision: 1172492

URL: http://svn.apache.org/viewvc?rev=1172492&view=rev
Log:
WW-3617 - Updates poms to include CDI plugin in the trunk

Modified:
struts/struts2/trunk/apps/blank/   (props changed)
struts/struts2/trunk/plugins/cdi/pom.xml
struts/struts2/trunk/plugins/pom.xml
struts/struts2/trunk/pom.xml

Propchange: struts/struts2/trunk/apps/blank/
--
--- svn:ignore (original)
+++ svn:ignore Mon Sep 19 07:02:17 2011
@@ -5,3 +5,5 @@
 *.iml
 *.iws
 target
+
+.idea

Modified: struts/struts2/trunk/plugins/cdi/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/cdi/pom.xml?rev=1172492&r1=1172491&r2=1172492&view=diff
==
--- struts/struts2/trunk/plugins/cdi/pom.xml (original)
+++ struts/struts2/trunk/plugins/cdi/pom.xml Mon Sep 19 07:02:17 2011
@@ -1,4 +1,24 @@
 
+
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
 4.0.0
@@ -6,33 +26,31 @@
 
 org.apache.struts
 struts2-plugins
-2.3-SNAPSHOT
+2.3.1-SNAPSHOT
 
 
 org.apache.struts
 struts2-cdi-plugin
-2.3-SNAPSHOT
+Struts 2 CDI Plugin
+jar
 
 
 
 
 javax.enterprise
 cdi-api
-1.0-SP1
 provided
 
 
 
 org.jboss.weld
 weld-core
-1.0.1-Final
 provided
 
 
 
 org.jboss.weld
 weld-se
-1.0.1-Final
 test
 
 

Modified: struts/struts2/trunk/plugins/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?rev=1172492&r1=1172491&r2=1172492&view=diff
==
--- struts/struts2/trunk/plugins/pom.xml (original)
+++ struts/struts2/trunk/plugins/pom.xml Mon Sep 19 07:02:17 2011
@@ -65,6 +65,7 @@
 json
 embeddedjsp
 gxp
+cdi
 
 
 

Modified: struts/struts2/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?rev=1172492&r1=1172491&r2=1172492&view=diff
==
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Mon Sep 19 07:02:17 2011
@@ -700,6 +700,25 @@
 2.1
 
 
+
+
+javax.enterprise
+cdi-api
+1.0-SP1
+
+
+
+org.jboss.weld
+weld-core
+1.0.1-Final
+
+
+
+org.jboss.weld
+weld-se
+1.0.1-Final
+
+

svn commit: r1172531 - /struts/struts2/trunk/plugins/cdi/pom.xml

2011-09-19 Thread lukaszlenart

Author: lukaszlenart
Date: Mon Sep 19 09:15:15 2011
New Revision: 1172531

URL: http://svn.apache.org/viewvc?rev=1172531&view=rev
Log:
WW-3617 - Adds missing dependency for commons-logging

Modified:
struts/struts2/trunk/plugins/cdi/pom.xml

Modified: struts/struts2/trunk/plugins/cdi/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/cdi/pom.xml?rev=1172531&r1=1172530&r2=1172531&view=diff
==
--- struts/struts2/trunk/plugins/cdi/pom.xml (original)
+++ struts/struts2/trunk/plugins/cdi/pom.xml Mon Sep 19 09:15:15 2011
@@ -72,6 +72,12 @@
 test
 
 
+
+commons-logging
+commons-logging
+test
+
+
 
 
 
\ No newline at end of file

[CONF] Confluence Changes in the last 24 hours

2011-09-19 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
-
Persistence edited by  tmielke  (08:22 AM)
https://cwiki.apache.org/confluence/display/ACTIVEMQ/Persistence



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

Pages
-
How To Release edited by  cutt...@apache.org  (06:52 PM)
https://cwiki.apache.org/confluence/display/AVRO/How+To+Release



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

Pages
-
Report September 2011 created by veithen (03:35 PM)
https://cwiki.apache.org/confluence/display/AXIS/Report+September+2011

PMC edited by  veithen  (03:29 PM)
https://cwiki.apache.org/confluence/display/AXIS/PMC



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

Pages
-
Camel 2.9.0 Release edited by  davsclaus  (03:52 AM)
https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.9.0+Release



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

Pages
-
Apache Felix Framework OSGi R4.3 CT Results created by he...@ungoverned.org 
(12:41 PM)
https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Framework+OSGi+R4.3+CT+Results

Apache Felix Framework OSGi R4.2 CT Results edited by  he...@ungoverned.org  
(12:39 PM)
https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Framework+OSGi+R4.2+CT+Results

Apache Felix Framework FAQ edited by  he...@ungoverned.org  (12:39 PM)
https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Framework+FAQ

Apache Felix Framework Configuration Properties edited by  he...@ungoverned.org 
 (12:35 PM)
https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Framework+Configuration+Properties

Board Report (2011-09) edited by  he...@ungoverned.org  (12:26 PM)
https://cwiki.apache.org/confluence/display/FELIX/Board+Report+%282011-09%29



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

Pages
-
PluginDeveloperKit edited by  jvs  (07:55 PM)
https://cwiki.apache.org/confluence/display/Hive/PluginDeveloperKit



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

Pages
-
Jackrabbit Status September 2011 edited by  jukka  (06:32 AM)
https://cwiki.apache.org/confluence/display/JCR/Jackrabbit+Status+September+2011



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

Pages
-
Visualizing Sample Clusters edited by  lance.nors...@gmail.com  (02:38 AM)
https://cwiki.apache.org/confluence/display/MAHOUT/Visualizing+Sample+Clusters



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

Pages
-
Changes integrate the forums into the AOOo project edited by  grobmeier  (09:24 
AM)
https://cwiki.apache.org/confluence/display/OOOUSERS/Changes+integrate+the+forums+into+the+AOOo+project

Concrete Proposal for Migration edited by  floris v  (09:04 AM)
https://cwiki.apache.org/confluence/display/OOOUSERS/Concrete+Proposal+for+Migration


Comments
https://cwiki.apache.org/confluence/display/OOOUSERS/Changes+integrate+the+forums+into+the+AOOo+project
 (9)

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

Pages
-
OAuth 2.0 Service Provider Implementation in Apache Shindig edited by  
woods...@gmail.com  (01:10 PM)
https://cwiki.apache.org/confluence/display/SHINDIG/OAuth+2.0+Service+Provider+Implementation+in+Apache+Shindig



Apache Sling Website (https://cwiki.apache.org/confluence/display/SLINGxSITE)

Pages
-
Embedding Sling edited by  fmeschbe  (05:58 AM)
https://cwiki.apache.org/confluence/display/SLINGxSITE/Embedding+Sling



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

Pages
-
Websites based on Wicket edited by  phi...@icecreamwear.com  (12:45 PM)
https://cwiki.apache.org/confluence/display/WICKET/Websites+based+on+Wicket

Request mapping edited by  sebastian  (07:42 AM)
https://cwiki.apache.org/confluence/display/WICKET/Request+mapping



-
Users
-

svn commit: r1172980 - /struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java

2011-09-19 Thread lukaszlenart

Author: lukaszlenart
Date: Tue Sep 20 05:45:30 2011
New Revision: 1172980

URL: http://svn.apache.org/viewvc?rev=1172980&view=rev
Log:
WW-3633 - better way to timestamps file used in tests

Modified:

struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java

Modified: 
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java?rev=1172980&r1=1172979&r2=1172980&view=diff
==
--- 
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
 (original)
+++ 
struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java
 Tue Sep 20 05:45:30 2011
@@ -15,30 +15,29 @@
  */
 package com.opensymphony.xwork2.config.providers;
 
+import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.config.ConfigurationProvider;
 import com.opensymphony.xwork2.config.RuntimeConfiguration;
-import com.opensymphony.xwork2.config.impl.MockConfiguration;
 import com.opensymphony.xwork2.config.entities.PackageConfig;
+import com.opensymphony.xwork2.config.impl.MockConfiguration;
 import com.opensymphony.xwork2.util.ClassLoaderUtil;
 import com.opensymphony.xwork2.util.FileManager;
-import com.opensymphony.xwork2.ObjectFactory;
+import org.w3c.dom.Document;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.ArrayList;
-
-import org.w3c.dom.Document;
 
 
 public class XmlConfigurationProviderTest extends ConfigurationTestBase {
 
 public void testLoadOrder() throws Exception {
 configuration = new MockConfiguration();
-((MockConfiguration)configuration).selfRegister();
+((MockConfiguration) configuration).selfRegister();
 container = configuration.getContainer();
 
 XmlConfigurationProvider prov = new 
XmlConfigurationProvider("xwork-test-load-order.xml", true) {
@@ -54,13 +53,25 @@ public class XmlConfigurationProviderTes
 prov.setObjectFactory(container.getInstance(ObjectFactory.class));
 prov.init(configuration);
 List docs = prov.getDocuments();
-assertEquals(3, docs.size() );
+assertEquals(3, docs.size());
 
 assertEquals(1, XmlHelper.getLoadOrder(docs.get(0)).intValue());
 assertEquals(2, XmlHelper.getLoadOrder(docs.get(1)).intValue());
 assertEquals(3, XmlHelper.getLoadOrder(docs.get(2)).intValue());
 }
 
+public static final long FILE_TS_WAIT_IN_MS = 360;
+
+private static void changeFileTime(File f) throws Exception {
+final long orig = f.lastModified();
+final long maxwait = orig + FILE_TS_WAIT_IN_MS;
+long curr;
+while (!f.setLastModified(curr = System.currentTimeMillis()) || orig 
== f.lastModified()) {
+Thread.sleep(500);
+assertTrue("Waited more than " + FILE_TS_WAIT_IN_MS + " ms to 
update timestamp on file: " + f, maxwait > curr);
+}
+}
+
 public void testNeedsReload() throws Exception {
 FileManager.setReloadingConfigs(true);
 final String filename = 
"com/opensymphony/xwork2/config/providers/xwork-test-actions.xml";
@@ -68,9 +79,9 @@ public class XmlConfigurationProviderTes
 
 assertTrue(!provider.needsReload());
 
-File file = new File(getClass().getResource("/"+filename).getFile());
-assertTrue(file.exists());
-file.setLastModified(System.currentTimeMillis());
+File file = new File(getClass().getResource("/" + filename).toURI());
+assertTrue("not exists: " + file.toString(), file.exists());
+changeFileTime(file);
 
 assertTrue(provider.needsReload());
 }
@@ -148,7 +159,7 @@ public class XmlConfigurationProviderTes
 File file = new File(uri);
 
 assertTrue(file.exists());
-file.setLastModified(System.currentTimeMillis());
+changeFileTime(file);
 
 assertTrue(provider.needsReload());
 }
@@ -175,14 +186,14 @@ public class XmlConfigurationProviderTes
 int startIndex = fullPath.indexOf(":file:/");
 int endIndex = fullPath.indexOf("!/");
 
-String jar = fullPath.substring(startIndex + (":file:/".length() -1 ), 
endIndex).replaceAll("%20", " ");
+String jar = fullPath.substring(startIndex + (":file:/".length() - 1), 
endIndex).replaceAll("%20", " ");
 
 File file = new File(jar);
-
+
 assertTrue("File [" + file + "] doesn't exist!", file.exists());
 file.setLastModified(System.currentTimeMillis());
 
 a

svn commit: r1172492 - in /struts/struts2/trunk: apps/blank/ plugins/cdi/pom.xml plugins/pom.xml pom.xml

svn commit: r1172531 - /struts/struts2/trunk/plugins/cdi/pom.xml

[CONF] Confluence Changes in the last 24 hours

svn commit: r1172980 - /struts/struts2/trunk/xwork-core/src/test/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProviderTest.java

4 matches

Site Navigation

Mail list logo

Footer information