svn commit: r446738 - in /incubator/roller/trunk: nbproject/project.xml src/org/apache/roller/webservices/adminapi/AppUrl.java src/org/apache/roller/webservices/adminapi/Handler.java

[jt...@apache.org]

Author: jtb
Date: Fri Sep 15 14:17:11 2006
New Revision: 446738

URL: http://svn.apache.org/viewvc?view=rev&rev=446738
Log:
fix aapp URLs to include /roller-services

Modified:
    incubator/roller/trunk/nbproject/project.xml
    incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/AppUrl.java
    incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java

Modified: incubator/roller/trunk/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/nbproject/project.xml?view=diff&rev=446738&r1=446737&r2=446738
==============================================================================
--- incubator/roller/trunk/nbproject/project.xml (original)
+++ incubator/roller/trunk/nbproject/project.xml Fri Sep 15 14:17:11 2006
@@ -4,7 +4,7 @@
     <configuration>
         <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
             <!--Do not use Project Properties customizer when editing this file manually.-->
-            <name>roller_3.0</name>
+            <name>roller</name>
             <!--
             <properties>
                 <property name="src.dir">../src</property>

Modified: incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/AppUrl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/AppUrl.java?view=diff&rev=446738&r1=446737&r2=446738
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/AppUrl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/AppUrl.java Fri Sep 15 14:17:11 2006
@@ -34,8 +34,9 @@
     private String handle;
     
     public AppUrl(String urlPrefix, String handle) throws MalformedURLException {
-        entryUrl = new URL(urlPrefix + ENDPOINT + "/" + handle + "/entries");
-        resourceUrl = new URL(urlPrefix + ENDPOINT + "/" + handle + "/resources");        
+        //TODO: is this the right thing to do? hardcode roller-services?
+        entryUrl = new URL(urlPrefix + "/roller-services" + ENDPOINT + "/" + handle + "/entries");
+        resourceUrl = new URL(urlPrefix + "/roller-services" + ENDPOINT + "/" + handle + "/resources");        
     }    
 
     public AppUrl(URL url) throws MalformedURLException {

Modified: incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java?view=diff&rev=446738&r1=446737&r2=446738
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/webservices/adminapi/Handler.java Fri Sep 15 14:17:11 2006
@@ -133,7 +133,8 @@
         this.uri = new URI(request);
         this.rollerContext = RollerContext.getRollerContext();
         this.roller = RollerFactory.getRoller();
-        this.urlPrefix = RollerRuntimeConfig.getAbsoluteContextURL() + ENDPOINT;
+        //TODO: is this the right thing to do? hardcode roller-services?
+        this.urlPrefix = RollerRuntimeConfig.getAbsoluteContextURL() + "/roller-services" + ENDPOINT;
         
         // TODO: decide what to do about authentication, is WSSE going to fly?
         //Authenticator auth = new WSSEAuthenticator(request);