svn commit: r1303819 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/SynapseConfiguration.java rest/API.java

[uswick]

Author: uswick
Date: Thu Mar 22 14:57:08 2012
New Revision: 1303819

URL: http://svn.apache.org/viewvc?rev=1303819&view=rev
Log:
committing patch for API versioning deployment

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/rest/API.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java?rev=1303819&r1=1303818&r2=1303819&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfiguration.java
 Thu Mar 22 14:57:08 2012
@@ -317,7 +317,7 @@ public class SynapseConfiguration implem
     public void addAPI(String name, API api) {
         if (!apiTable.containsKey(name)) {
             for (API existingAPI : apiTable.values()) {
-                if (existingAPI.getContext().equals(api.getContext())) {
+                if (api.getVersion().equals(existingAPI.getVersion()) && 
existingAPI.getContext().equals(api.getContext())) {
                     handleException("URL context: " + api.getContext() + " is 
already registered" +
                             " with the API: " + existingAPI.getName());
                 }
@@ -333,7 +333,7 @@ public class SynapseConfiguration implem
             handleException("No API exists by the name: " + name);
         } else {
             for (API existingAPI : apiTable.values()) {
-                if (existingAPI.getContext().equals(api.getContext()) && 
!name.equals(api.getName())) {
+                if (api.getVersion().equals(existingAPI.getVersion()) && 
existingAPI.getContext().equals(api.getContext()) && 
!name.equals(api.getName())) {
                     handleException("URL context: " + api.getContext() + " is 
already registered" +
                             " with the API: " + existingAPI.getName());
                 }

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/rest/API.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/rest/API.java?rev=1303819&r1=1303818&r2=1303819&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/rest/API.java 
(original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/rest/API.java 
Thu Mar 22 14:57:08 2012
@@ -66,6 +66,10 @@ public class API extends AbstractRESTPro
         return name;
     }
 
+    public String getVersion(){
+        return versionStrategy.getVersion();
+    }
+
     public String getContext() {
         return context;
     }