[CONF] Confluence Changes in the last 24 hours

2007-01-05 Thread confluence
-
This is a daily summary of all recent changes in Confluence.

-
Updated Spaces:
-

Apache Geronimo v1.2 (GMOxDOC12) 
http://cwiki.apache.org/confluence/display/GMOxDOC12
|
|-Pages Added or Edited in This Space
 |-- Using Geronimo's default JavaMail session was created by ccardona (09:25 
AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC12/Using+Geronimo%27s+default+JavaMail+session

Apache Qpid (qpid) http://cwiki.apache.org/confluence/display/qpid
|
|-Pages Added or Edited in This Space
 |-- CppStyleGuide was last edited by aconway (01:46 PM).
 |   http://cwiki.apache.org/confluence/display/qpid/CppStyleGuide

Apache Struts 2 Plugin Registry (S2PLUGINS) 
http://cwiki.apache.org/confluence/display/S2PLUGINS
|
|-Pages Added or Edited in This Space
 |-- Spring Webflow Plugin was created by [EMAIL PROTECTED] (04:50 PM).
 |   http://cwiki.apache.org/confluence/display/S2PLUGINS/Spring+Webflow+Plugin
 |-- Spring Webflow Plugin was created by [EMAIL PROTECTED] (04:27 PM).
 |   
http://cwiki.apache.org/confluence/display/S2PLUGINS/2007/01/04/Spring+Webflow+Plugin

Apache Geronimo v2.0 (GMOxDOC20) 
http://cwiki.apache.org/confluence/display/GMOxDOC20
|
|-Pages Added or Edited in This Space
 |-- Using Geronimo's default JavaMail session was created by ccardona (09:14 
AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC20/Using+Geronimo%27s+default+JavaMail+session

Apache Geronimo Project Management (GMOxPMGT) 
http://cwiki.apache.org/confluence/display/GMOxPMGT
|
|-Pages Added or Edited in This Space
 |-- Apache Geronimo Board Report was created by hcunico (07:31 AM).
 |   
http://cwiki.apache.org/confluence/display/GMOxPMGT/Apache+Geronimo+Board+Report

Apache Geronimo v1.1 (GMOxDOC11) 
http://cwiki.apache.org/confluence/display/GMOxDOC11
|
|-Pages Added or Edited in This Space
 |-- openejb-jar.xml was last edited by [EMAIL PROTECTED] (10:27 PM).
 |   http://cwiki.apache.org/confluence/display/GMOxDOC11/openejb-jar.xml
 |-- JBoss to Geronimo - Web Services Migration was last edited by [EMAIL 
PROTECTED] (08:57 PM).
 |   
http://cwiki.apache.org/confluence/display/GMOxDOC11/JBoss+to+Geronimo+-+Web+Services+Migration

Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW
|
|-Pages Added or Edited in This Space
 |-- a was last edited by musachy (02:08 PM).
 |   http://cwiki.apache.org/confluence/display/WW/a
 |-- Creating and Signing a Distribution was last edited by husted (05:07 AM).
 |   
http://cwiki.apache.org/confluence/display/WW/Creating+and+Signing+a+Distribution

Apache Directory Server v1.0 Documentation (DIRxSRVx10) 
http://cwiki.apache.org/confluence/display/DIRxSRVx10
|
|-Pages Added or Edited in This Space
 |-- ApacheDS v1.0 Advanced User's Guide was last edited by ck (09:38 AM).
 |   
http://cwiki.apache.org/confluence/display/DIRxSRVx10/ApacheDS+v1.0+Advanced+User%27s+Guide

Apache Struts 2 Wiki (S2WIKI) http://cwiki.apache.org/confluence/display/S2WIKI
|
|-Pages Added or Edited in This Space
 |-- Articles and press was last edited by [EMAIL PROTECTED] (04:11 PM).
 |   http://cwiki.apache.org/confluence/display/S2WIKI/Articles+and+press

UIMA (UIMA) http://cwiki.apache.org/confluence/display/UIMA
|
|-Pages Added or Edited in This Space
 |-- MergeJCasType was created by schor (03:09 PM).
 |   http://cwiki.apache.org/confluence/display/UIMA/MergeJCasType
 |-- ToDo was last edited by schor (02:34 PM).
 |   http://cwiki.apache.org/confluence/display/UIMA/ToDo
 |-- CasAndCasViewInterfaceRedesign was last edited by alally (01:50 PM).
 |   
http://cwiki.apache.org/confluence/display/UIMA/CasAndCasViewInterfaceRedesign
 |
 |-New Comments in This Space
 |-- 
http://cwiki.apache.org/confluence/display/UIMA/CasAndCasViewInterfaceRedesign 
(3)

Apache Directory LDAP Studio (DIRxSTUDIO) 
http://cwiki.apache.org/confluence/display/DIRxSTUDIO
|
|-Pages Added or Edited in This Space
 |-- Building was last edited by seelmann (02:01 AM).
 |   http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Building
 |-- Source repository was last edited by seelmann (01:58 AM).
 |   http://cwiki.apache.org/confluence/display/DIRxSTUDIO/Source+repository

Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET
|
|-Pages Added or Edited in This Space
 |-- Migrate-1.3 was last edited by ehillenius (09:17 PM).
 |   http://cwiki.apache.org/confluence/display/WICKET/Migrate-1.3
 |-- Rss Page was last edited by wireframe (02:39 PM).
 |   http://cwiki.apache.org/confluence/display/WICKET/Rss+Page
 |-- FAQs was last edited by loren (01:23 PM).
 |   http://cwiki.apache.org/confluence/display/WICKET/FAQs
 |-- How to load an external image was last edited by loren (01:18 PM).
 |   
http://cwiki.apache.org/confluence/display/WICKET/How+to+load+an+external+image


---

svn commit: r492987 - in /struts/struts2/trunk: apps/showcase/src/main/webapp/ajax/datepicker/ core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/ core/src/main/resources/template/aj

2007-01-05 Thread ddewolf
Author: ddewolf
Date: Fri Jan  5 03:27:27 2007
New Revision: 492987

URL: http://svn.apache.org/viewvc?view=rev&rev=492987
Log:
WW-1596 Fixing DatePicker and TimePicker.  Thanks Musachy

Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp

struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl
struts/struts2/trunk/core/src/main/resources/template/xhtml/timepicker.ftl

Modified: 
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp?view=diff&rev=492987&r1=492986&r2=492987
==
--- 
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp 
(original)
+++ 
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/datepicker/index.jsp 
Fri Jan  5 03:27:27 2007
@@ -12,7 +12,7 @@
 
 
 This should have the month label all on one line (problem in IE) appears fine 
in FF though.
-
+
 
 A calendar in your locale, or the closest thing to it we currently 
provide
 

Modified: 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js?view=diff&rev=492987&r1=492986&r2=492987
==
--- 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
 (original)
+++ 
struts/struts2/trunk/core/src/main/resources/org/apache/struts2/static/dojo/struts/widget/__package__.js
 Fri Jan  5 03:27:27 2007
@@ -2,6 +2,7 @@
common: ["struts.widget.Bind",
 "struts.widget.BindDiv",
 "struts.widget.BindAnchor",
-"struts.widget.ComboBox"]
+"struts.widget.ComboBox",
+"struts.widget.DatePicker"]
 });
 dojo.provide("struts.widget.*");

Modified: 
struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js?view=diff&rev=492987&r1=492986&r2=492987
==
--- struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/ajax/dojoRequire.js 
Fri Jan  5 03:27:27 2007
@@ -9,5 +9,7 @@
 dojo.require("struts.widget.BindDiv");
 dojo.require("struts.widget.BindAnchor");
 dojo.require("struts.widget.ComboBox");
+dojo.require("struts.widget.DatePicker");
+dojo.require("struts.widget.TimePicker");
 dojo.require("dojo.widget.Editor");
 dojo.hostenv.writeIncludes(); // not needed, but allows the Venkman debugger 
to work with the includes

Modified: 
struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl?view=diff&rev=492987&r1=492986&r2=492987
==
--- struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl 
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/datepicker.ftl 
Fri Jan  5 03:27:27 2007
@@ -1,19 +1,24 @@
-
-dojo.require("dojo.widget.DatePicker");
-
-
-
+value="${parameters.nameValue?html}"<#rt/>
+  
+  <#if parameters.name?if_exists != "">
+name="${parameters.name?html}"<#rt/>
+id="struts_${parameters.name?html}"<#rt/>
+  
+>
+
 id="${parameters.id?html}"<#rt/>
   
-  <#if parameters.value?if_exists != "">
-value="${parameters.value?html}"<#rt/>
+  <#if parameters.name?if_exists != "">
+inputId="struts_${parameters.name?html}"<#rt/>
+  
+  <#if parameters.nameValue?if_exists != "">
+value="${parameters.nameValue?html}"<#rt/>
   
   <#if parameters.language?if_exists != "">
 lang="${parameters.language?html}"<#rt/>
-  
-  <#if parameters.name?if_exists != "">
-name="${parameters.name?html}"<#rt/>
   
   <#if parameters.displayWeeks?if_exists != "">
 displayWeeks="${parameters.displayWeeks?html}"<#rt/>

Modified: 
struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/timepicker.ftl?view=diff&rev=492987&r1=492986&r2=492987
==
--- struts/struts2/trunk/core/src/main/r

svn commit: r493004 - /struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java

2007-01-05 Thread apetrelli
Author: apetrelli
Date: Fri Jan  5 04:12:47 2007
New Revision: 493004

URL: http://svn.apache.org/viewvc?view=rev&rev=493004
Log:
STR-2986
Corrected test case, now TestTilesPlugin works.

Modified:

struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java

Modified: 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java?view=diff&rev=493004&r1=493003&r2=493004
==
--- 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
 (original)
+++ 
struts/struts1/trunk/tiles2/src/test/java/org/apache/struts/tiles2/TestTilesPlugin.java
 Fri Jan  5 04:12:47 2007
@@ -39,6 +39,7 @@
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.definition.DefinitionsFactory;
 import org.apache.tiles.impl.BasicTilesContainer;
+import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
 
 public class TestTilesPlugin extends TestMockBase {
 
@@ -173,11 +174,11 @@
 TilesContainer container = TilesAccess.getContainer(actionServlet
 .getServletContext());
 assertSame(container.getClass().getName(),
-BasicTilesContainer.class.getName());
+KeyedDefinitionsFactoryTilesContainer.class.getName());
 
 // Retrieve factory for module1
-DefinitionsFactory factory1 = ((BasicTilesContainer) container)
-.getDefinitionsFactory();
+DefinitionsFactory factory1 = ((KeyedDefinitionsFactoryTilesContainer) 
container)
+.getDefinitionsFactory("/module1");
 
 assertNotNull("factory found", factory1);
 
@@ -185,8 +186,8 @@
 request.setAttribute(Globals.MODULE_KEY, module2);
 request.setPathElements("/myapp", "/module2/foo.do", null, null);
 // Retrieve factory for module2
-DefinitionsFactory factory2 = ((BasicTilesContainer) container)
-.getDefinitionsFactory();
+DefinitionsFactory factory2 = ((KeyedDefinitionsFactoryTilesContainer) 
container)
+.getDefinitionsFactory("/module2");
 assertNotNull("factory found", factory2);
 
 // Check that factory are different




svn commit: r493017 - /struts/struts1/trunk/tiles2/pom.xml

2007-01-05 Thread apetrelli
Author: apetrelli
Date: Fri Jan  5 04:56:55 2007
New Revision: 493017

URL: http://svn.apache.org/viewvc?view=rev&rev=493017
Log:
STR-2986
Compiling using Java 5.

Modified:
struts/struts1/trunk/tiles2/pom.xml

Modified: struts/struts1/trunk/tiles2/pom.xml
URL: 
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/pom.xml?view=diff&rev=493017&r1=493016&r2=493017
==
--- struts/struts1/trunk/tiles2/pom.xml (original)
+++ struts/struts1/trunk/tiles2/pom.xml Fri Jan  5 04:56:55 2007
@@ -49,6 +49,18 @@

 

+  
+ 
+
+   org.apache.maven.plugins
+   maven-compiler-plugin
+   
+   1.5
+   1.5
+   
+
+ 
+  
   
  
 src/main/resources




Issues Closed: week of 2007-01-05

2007-01-05 Thread dblevins

Struts2 - Friday, January 5, 2007

  28 closed in last 7 days

[WW-1596] DatePicker and TimePicker are not working at all
  David H. DeWolf - Bug - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1596

[WW-1418] Struts 2 does not compile against Tiles 2.0-SNAPSHOT
  Don Brown - Bug - [2.0.1]
  http://issues.apache.org/struts/browse/WW-1418

[WW-1100] Adding autocomplete funcitonality to webwork
  Unassigned - Improvement - [Future]
  http://issues.apache.org/struts/browse/WW-1100

[WW-1429] Tooltips display twice
  Don Brown - Bug - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1429

[WW-1584] Allow multiple tag libraries
  Don Brown - Improvement - [2.0.2]
  http://issues.apache.org/struts/browse/WW-1584

[WW-1557] multiple="true" does not work in s:select tag
  David H. DeWolf - Bug - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1557

[WW-1595] Allow codebehind to select the starting directory point 
  Don Brown - New Feature - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1595

[WW-1579] DropdownDateTimePicker is not loading value from property
  Ted Husted - Bug - [2.0.2]
  http://issues.apache.org/struts/browse/WW-1579

[WW-1590] Allow new template engines and tag libraries to be discovered 
automatically
  Don Brown - Improvement - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1590

[WW-1551] Ignore parameters that start with "dojo"
  Don Brown - Improvement - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1551

[WW-1483] 2.0.2 Omnibus
  Unassigned - Task - [2.0.2]
  http://issues.apache.org/struts/browse/WW-1483

[WW-1395] Create aggregated Struts 2 and XWork Javadoc
  Don Brown - Improvement - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1395

[WW-1583] Linked Autocompleter not working on IE 6
  Don Brown - Bug - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1583

[WW-1577] Improve handling of type conversion when loading action from URL
  Don Brown - Improvement - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1577

[WW-1523] DefaultActionMapper ignores "/"  between the namespace and action 
name when there are "/" in action name
  Don Brown - Bug - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1523

[WW-1585] Automate inclusion of the Confluence wiki docs in the release 
assembly
  Wendy Smoak - Improvement - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1585

[WW-1578] ComboBox works incorrect within 
  Don Brown - Bug - []
  http://issues.apache.org/struts/browse/WW-1578

[WW-1591] OptionTransferSelect doubleSize is ignored in lieu of size 
property
  David H. DeWolf - Bug - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1591

[WW-1476] Update the calendar lang file for language French
  Unassigned - Sub-task - [Future]
  http://issues.apache.org/struts/browse/WW-1476

[WW-1587] Maven build should produce -sources and -javadoc jars for the 
repository
  Don Brown - Improvement - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1587

[WW-1547] Submit tag webapp root repeats when path saved to local variable
  Don Brown - Bug - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1547

[WW-1543] RequestContextImpl is not cleaned up on undeploy
  Don Brown - Bug - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1543

[WW-1582] FreemarkerManager is not using default encoding from 
StrutsConstants.STRUTS_I18N_ENCODING
  Don Brown - Bug - [2.0.2]
  http://issues.apache.org/struts/browse/WW-1582

[WW-1581] Problems with handling of Double in the request parameters
  Don Brown - Bug - []
  http://issues.apache.org/struts/browse/WW-1581

[WW-1586] Remove the struts2-all module
  Don Brown - Task - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1586

[WW-1592] Remove unnecessary import
  Don Brown - Improvement - [2.0.3]
  http://issues.apache.org/struts/browse/WW-1592

[WW-1524] Quickstart does not launch
  Don Brown - Bug - [2.0.2]
  http://issues.apache.org/struts/browse/WW-1524

[WW-1580] NullPointerException 
evaluateExtraParamsServletRequest(Form.java:270)
  Don Brown - Bug - [2.0.2]
  http://issues.apache.org/struts/browse/WW-1580



svn commit: r493110 - in /struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web: PhoneBook.ashx PhoneBook.html

2007-01-05 Thread husted
Author: husted
Date: Fri Jan  5 10:05:38 2007
New Revision: 493110

URL: http://svn.apache.org/viewvc?view=rev&rev=493110
Log:
PhoneBook2 - Add input form, refine workflow. 




Modified:
struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx
struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html

Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx?view=diff&rev=493110&r1=493109&r2=493110
==
--- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx 
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx Fri 
Jan  5 10:05:38 2007
@@ -55,6 +55,29 @@
 // if helper.IsNominal ... 
 AppEntryList list = helper.Outcome as AppEntryList;
 return list.ToAppEntryArray();
-}
+}
+
+[JsonRpcMethod(App.ENTRY, Idempotent = true)]
+[JsonRpcHelp("Returns an entry by key.")]
+public AppEntry entry(string key)
+{
+IViewHelper helper = GetCatalog().GetHelperFor(App.ENTRY);
+helper.Criteria[App.ENTRY_KEY] = key;
+helper.Execute();
+// if helper.IsNominal ... 
+return helper.Outcome[0] as AppEntry;
+}
+
+[JsonRpcMethod(App.ENTRY_SAVE, Idempotent = true)]
+[JsonRpcHelp("Saves the entry, insert or updating as appropriate.")]
+public IDictionary entry_save(IDictionary input)
+{
+IViewHelper helper = GetCatalog().GetHelperFor(App.ENTRY_SAVE);
+helper.Read(input,true);
+helper.Execute();
+// if helper.IsNominal ... 
+return helper.Outcome[0] as IDictionary;
+}
+
 }
 }

Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html?view=diff&rev=493110&r1=493109&r2=493110
==
--- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html 
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html Fri 
Jan  5 10:05:38 2007
@@ -14,12 +14,14 @@
 dojo.require("dojo.json");
dojo.require("dojo.widget.FilteringTable");
dojo.hostenv.writeIncludes();
-
-function dojoChannel(call)
+   
+   /* call server */
+   
+function server(call)
 {
 var bindArgs = {
 url: call.url+'?rpc',
-error: function(type, data, evt){alert("error");},
+error: function(type, data, evt){alert("Error 
Communicating with Server: " + data);},
 method: "POST",
 mimetype: "text/json",
 handle: call.callback,
@@ -30,64 +32,68 @@
 return req;
 }
 
-function last_name_list_element(type, data, evt)
-{
-var arr = data.result;
-var last_name_list = dojo.byId('last_name_list');
-var select = document.createElement('select');
-for(var i=0; i < arr.length; i++)
-{
-select.options[i] = new Option(arr[i], arr[i]);
-}
-var label = document.createElement('label');
-label.value = "Last Name: ";
-last_name_list.appendChild(label);
-last_name_list.appendChild(select);
-}
-
-function last_name_list()
-{
-
PhoneBook.rpc.last_name_list(last_name_list_element).call(dojoChannel);
-}
-
-dojo.event.connect(window, "onload", last_name_list);  
  
-
-function entry_list_element(type, data, evt)
+/* lister */
+
+function entry_list_result(type, data, evt)
 {
var w = dojo.widget.byId("entry_list");
 w.store.setData(data.result);
-}
-
+}
 function entry_list()
 {
-
PhoneBook.rpc.entry_list(entry_list_element).call(dojoChannel);
+ 

svn commit: r493148 - in /struts/struts2/trunk/plugins/codebehind/src: main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java test/java/org/apache/struts2/codebehind/CodebehindUnknownHa

2007-01-05 Thread mrdon
Author: mrdon
Date: Fri Jan  5 11:20:09 2007
New Revision: 493148

URL: http://svn.apache.org/viewvc?view=rev&rev=493148
Log:
Changed to use constructor injection since two injections depended on each other
WW-1595

Modified:

struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java

struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java

Modified: 
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java?view=diff&rev=493148&r1=493147&r2=493148
==
--- 
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
 (original)
+++ 
struts/struts2/trunk/plugins/codebehind/src/main/java/org/apache/struts2/codebehind/CodebehindUnknownHandler.java
 Fri Jan  5 11:20:09 2007
@@ -61,20 +61,13 @@
 protected ObjectFactory objectFactory;
 
 protected static final Log LOG = 
LogFactory.getLog(CodebehindUnknownHandler.class);
-
-@Inject("struts.codebehind.pathPrefix")
-public void setPathPrefix(String prefix) {
-this.templatePathPrefix=prefix;
-}
-
-@Inject("struts.codebehind.defaultPackage")
-public void setDefaultPackage(String pkg) {
-this.defaultPackageName = pkg;
-}
-
+
 @Inject
-public void setConfiguration(Configuration config) {
-this.configuration = config;
+public 
CodebehindUnknownHandler(@Inject("struts.codebehind.defaultPackage") String 
defaultPackage, 
+@Inject Configuration configuration) {
+
+this.configuration = configuration;
+this.defaultPackageName = defaultPackage;
 resultsByExtension = new LinkedHashMap();
 PackageConfig parentPackage = 
configuration.getPackageConfig(defaultPackageName);
 Map results = 
parentPackage.getAllResultTypeConfigs();
@@ -82,6 +75,12 @@
 resultsByExtension.put("jsp", results.get("dispatcher"));
 resultsByExtension.put("vm", results.get("velocity"));
 resultsByExtension.put("ftl", results.get("freemarker"));
+   
+}
+
+@Inject("struts.codebehind.pathPrefix")
+public void setPathPrefix(String prefix) {
+this.templatePathPrefix=prefix;
 }
 
 @Inject

Modified: 
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java?view=diff&rev=493148&r1=493147&r2=493148
==
--- 
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
 (original)
+++ 
struts/struts2/trunk/plugins/codebehind/src/test/java/org/apache/struts2/codebehind/CodebehindUnknownHandlerTest.java
 Fri Jan  5 11:20:09 2007
@@ -43,10 +43,8 @@
 public void setUp() throws Exception {
 super.setUp();
 mockServletContext = new Mock(ServletContext.class);
-handler = new CodebehindUnknownHandler();
-handler.setDefaultPackage("codebehind-default");
+handler = new CodebehindUnknownHandler("codebehind-default", 
configuration);
 handler.setPathPrefix("/");
-handler.setConfiguration(configuration);
 handler.setObjectFactory(container.getInstance(ObjectFactory.class));
 handler.setServletContext((ServletContext)mockServletContext.proxy());
 }




svn commit: r493264 - in /struts/sandbox/trunk/overdrive/PhoneBook2: ./ projects/Core/ projects/Core/Commands/ projects/Test/ projects/Web/

2007-01-05 Thread husted
Author: husted
Date: Fri Jan  5 17:03:09 2007
New Revision: 493264

URL: http://svn.apache.org/viewvc?view=rev&rev=493264
Log:
PhoneBook2 - Add formatting test, conform AppEntry with latest Nexus, refine 
workflow. 




Modified:
struts/sandbox/trunk/overdrive/PhoneBook2/PhoneBook2.sln
struts/sandbox/trunk/overdrive/PhoneBook2/projects/Core/AppEntry.cs
struts/sandbox/trunk/overdrive/PhoneBook2/projects/Core/AppEntryList.cs

struts/sandbox/trunk/overdrive/PhoneBook2/projects/Core/Commands/BaseEntry.cs

struts/sandbox/trunk/overdrive/PhoneBook2/projects/Core/TelephoneProcessor.cs
struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/Objects.xml
struts/sandbox/trunk/overdrive/PhoneBook2/projects/Test/Test.csproj
struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.ashx
struts/sandbox/trunk/overdrive/PhoneBook2/projects/Web/PhoneBook.html

Modified: struts/sandbox/trunk/overdrive/PhoneBook2/PhoneBook2.sln
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/PhoneBook2.sln?view=diff&rev=493264&r1=493263&r2=493264
==
--- struts/sandbox/trunk/overdrive/PhoneBook2/PhoneBook2.sln (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook2/PhoneBook2.sln Fri Jan  5 
17:03:09 2007
@@ -27,6 +27,11 @@
VWDPort = "3594"
EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", 
"Solution Items", "{F5B697F2-0FFC-4459-BCBB-5F6F4DB01D64}"
+   ProjectSection(SolutionItems) = preProject
+   ..\Nexus\Core\Validators\DateTimeProcessor.cs = 
..\Nexus\Core\Validators\DateTimeProcessor.cs
+   EndProjectSection
+EndProject
 Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET

Modified: struts/sandbox/trunk/overdrive/PhoneBook2/projects/Core/AppEntry.cs
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/overdrive/PhoneBook2/projects/Core/AppEntry.cs?view=diff&rev=493264&r1=493263&r2=493264
==
--- struts/sandbox/trunk/overdrive/PhoneBook2/projects/Core/AppEntry.cs 
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook2/projects/Core/AppEntry.cs Fri Jan 
 5 17:03:09 2007
@@ -15,6 +15,7 @@
  */
 using System;
 using System.Collections;
+using Nexus.Core;
 
 namespace PhoneBook.Core
 {
@@ -23,73 +24,41 @@
 /// 
 /// 
 [Serializable]
-public class AppEntry
+public class AppEntry : EntryDictionary
 {
-/// 
-/// Internal storage.
-/// 
-/// 
-private IDictionary _Value = new Hashtable(5);
 
-/// 
-/// Add each source entry to our internal store. 
-/// 
-/// 
-/// Entries with keys that match the property names will be exposed. 
-/// Other entries may be added, but can only be retrieved via Get.
-/// 
-/// Entries to add
-/// 
-public void AddAll(IDictionary sources)
+public AppEntry()
 {
-ICollection keys = sources.Keys;
-foreach (string key in keys)
-{
-Add(key, sources[key] as string);
-}
+// Default contstructor
 }
 
-/// 
-/// Add a single entry to our internal store.
-/// 
-/// 
-/// Entries with keys that match the property names will be exposed. 
-/// Other entries may be added, but can only be retrieved via Get.
-/// 
-/// ID for entry
-/// Content for entry
-/// 
-public void Add(string key, string value)
+public AppEntry(IDictionary sources)
 {
-_Value.Add(key, value);
+AddAll(sources);
 }
 
-/// 
-/// Provide the value corresponding to key from the internal store.
-/// 
-/// ID for entry
-/// Content for entry
-/// 
-public string Get(string key)
+public AppEntry(AppEntry row)
 {
-return _Value[key] as string;
+AddAll(row);
 }
 
 /// 
-/// Set an entry to the internal store, overwriting any existing entry.
+/// Add each source entry to our internal store. 
 /// 
 /// 
-/// This is a protected method used by the Properties. 
-/// Use an existing Property to set values, 
-/// or extend the class to include other Properties. 
+/// Entries with keys that match the property names will be exposed. 
+/// Other entries may be added, but can only be retrieved via Get.
 /// 
-/// 
-/// 
-protected void Set(string key, string value)
+/// Entries to add
+/// 
+public void AddAll(AppEntry row)
 {
-_Value[key] = value;
+IColle