svn commit: r693388 - in /forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher: api/ContractOld.java helper/StructurerHelperStAX.java impl/DefaultContract.java

[thorsten]

Author: thorsten
Date: Tue Sep  9 00:14:14 2008
New Revision: 693388

URL: http://svn.apache.org/viewvc?rev=693388&view=rev
Log:
Moving old api out of the way 

Modified:
    
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java
    
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StructurerHelperStAX.java
    
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java

Modified: 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java?rev=693388&r1=693387&r2=693388&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java
 (original)
+++ 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/api/ContractOld.java
 Tue Sep  9 00:14:14 2008
@@ -23,7 +23,7 @@
  * @author thorsten
  *
  */
-public interface Contract {
+public interface ContractOld {
     
     /**
      * @return the name of the contract

Modified: 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StructurerHelperStAX.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StructurerHelperStAX.java?rev=693388&r1=693387&r2=693388&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StructurerHelperStAX.java
 (original)
+++ 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/helper/StructurerHelperStAX.java
 Tue Sep  9 00:14:14 2008
@@ -50,7 +50,7 @@
 import javax.xml.stream.util.XMLEventAllocator;
 import javax.xml.transform.TransformerConfigurationException;
 
-import org.apache.forrest.dispatcher.api.Contract;
+import org.apache.forrest.dispatcher.api.ContractOld;
 import org.apache.forrest.dispatcher.impl.DefaultContract;
 import org.apache.forrest.dispatcher.utils.CommonString;
 
@@ -347,7 +347,7 @@
                 + propertiesHelper.getContractSuffix();
         String cachedTemplate = propertiesHelper.getCacheContracts() + name
                 + propertiesHelper.getContractSuffix() + ".xsl";
-        Contract contract = new DefaultContract(home);
+        ContractOld contract = new DefaultContract(home);
         contract.initialize(source, cachedTemplate);
         HashMap<String, File> param = new HashMap<String, File>();
         while (true) {
@@ -380,7 +380,7 @@
     }
 
     private void processContractResult(String data, String destination,
-            Contract contract, HashMap<String, File> param)
+            ContractOld contract, HashMap<String, File> param)
             throws XMLStreamException, FileNotFoundException {
         File contractResult = contract.execute(data, param, destination);
         LinkedHashSet<XMLEvent> pathElement;

Modified: 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java
URL: 
http://svn.apache.org/viewvc/forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java?rev=693388&r1=693387&r2=693388&view=diff
==============================================================================
--- 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java
 (original)
+++ 
forrest/trunk/whiteboard/dispatcher/java/org/apache/forrest/dispatcher/impl/DefaultContract.java
 Tue Sep  9 00:14:14 2008
@@ -19,14 +19,14 @@
 import java.io.File;
 import java.util.HashMap;
 
-import org.apache.forrest.dispatcher.api.Contract;
+import org.apache.forrest.dispatcher.api.ContractOld;
 import org.apache.forrest.dispatcher.helper.ContractHelperStAX;
 
 /**
  * @author thorsten
  * 
  */
-public class DefaultContract implements Contract {
+public class DefaultContract implements ContractOld {
 
     private String name, usage, description;
     private File template;