You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2007/09/12 03:19:12 UTC
svn commit: r574744 - in /roller/trunk: apps/weblogger/
apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/
apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/
apps/weblogger/src/java/org/apache/roller/weblogger...
Author: snoopdave
Date: Tue Sep 11 18:19:11 2007
New Revision: 574744
URL: http://svn.apache.org/viewvc?rev=574744&view=rev
Log:
Fix for http://opensource.atlassian.com/projects/roller/browse/ROL-1560
"RAP broken in 4.0" - fixing problems caused by move to JPA, RAP tests work 100% now. Also fixed example Groovy scripts that call RAP.
Modified:
roller/trunk/apps/weblogger/build.xml
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/AappTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java
roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java
roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/README.txt
roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/lib/roller-rap-sdk.jar
roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listcollections.gy
roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listusers.gy
Modified: roller/trunk/apps/weblogger/build.xml
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/build.xml?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/build.xml (original)
+++ roller/trunk/apps/weblogger/build.xml Tue Sep 11 18:19:11 2007
@@ -150,24 +150,33 @@
<!-- Copy resources -->
<copy todir="${build.compile.business}">
- <fileset dir="${ro.src}"
- excludes="**/*.java, **/*.html, **/*.png, org/apache/roller/weblogger/ui/**, org/apache/roller/weblogger/webservices/**, org/apache/roller/weblogger/planet/**" />
+ <fileset dir="${ro.src}">
+ <exclude name="**/*.java" />
+ <exclude name="**/*.html" />
+ <exclude name="**/*.png" />
+ <exclude name="org/apache/roller/weblogger/ui/**" />
+ <exclude name="org/apache/roller/weblogger/webservices/**" />
+ <exclude name="org/apache/roller/weblogger/planet/**" />
+ </fileset>
</copy>
<mkdir dir="${build.compile.business}/META-INF" />
<copy todir="${build.compile.business}/META-INF" file="${ro.src}/META-INF/persistence.xml" />
<!-- OpenJPA bytecode enhancement -->
- <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="business.path" />
- <openjpac>
+ <path id="openjpac.path">
+ <path refid="business.path"/>
+ <pathelement path="${build.compile.business}" />
+ <pathelement path="${build.compile.business}/org/apache/roller/weblogger/pojos" />
+ </path>
+ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="openjpac.path" />
+ <openjpac enforcePropertyRestrictions="false" >
<config propertiesFile="${ro.src}/META-INF/persistence.xml" />
- <classpath>
- <path refid="business.path"/>
- <pathelement location="${build.compile.business}" />
- <pathelement location="${build.compile.business}/org/apache/roller/weblogger/pojos" />
- &custom-jars;
- </classpath>
- </openjpac>
+ <!--<fileset dir="${build.compile.business}">
+ <include name="**/pojos/*.class" />
+ </fileset>-->
+ <classpath refid="openjpac.path" />
+ </openjpac>
<!-- JPA/Toplink bytecode enhancement
<taskdef name="weave" classname="oracle.toplink.essentials.weaving.StaticWeaveAntTask" classpathref="business.path"/>
@@ -872,8 +881,8 @@
<target name="test-rap" depends="test-rap-sdk, test-rap-handler"/>
<target name="test-rap-sdk">
- <mkdir dir="${build.reports}/webservices/adminprotocol/sdk/xml"/>
- <mkdir dir="${build.reports}/webservices/adminprotocol/sdk/html"/>
+ <mkdir dir="${build.reports}/webservices/adminprotocol-sdk/xml"/>
+ <mkdir dir="${build.reports}/webservices/adminprotocol-sdk/html"/>
<junit fork="true" dir="${build.tests}" printsummary="on" showOutput="true">
<syspropertyset>
@@ -883,23 +892,23 @@
<path refid="tests.run.path"/>
</classpath>
<formatter type="xml"/>
- <batchtest toDir="${build.reports}/webservices/protocol/sdk/xml">
- <fileset dir="${build.tests}/WEB-INF/classes">
- <include name="org/apache/roller/weblogger/webservices/protocol/sdk/*EntryTest.class"/>
+ <batchtest toDir="${build.reports}/webservices/adminprotocol/sdk/xml">
+ <fileset dir="${build.compile.tests}">
+ <include name="org/apache/roller/weblogger/webservices/adminapi/sdk/*EntryTest.class"/>
</fileset>
</batchtest>
</junit>
- <junitreport todir="${build.reports}/webservices/protocol/sdk/xml">
- <fileset dir="${build.reports}/webservices/protocol/sdk/xml">
+ <junitreport todir="${build.reports}/webservices/adminprotocol-sdk/xml">
+ <fileset dir="${build.reports}/webservices/adminprotocol-sdk/xml">
<include name="TEST-*.xml"/>
</fileset>
- <report format="noframes" toDir="${build.reports}/webservices/protocol/sdk/html"/>
+ <report format="noframes" toDir="${build.reports}/webservices/adminprotocol/sdk/html"/>
</junitreport>
</target>
<target name="test-rap-handler">
- <mkdir dir="${build.reports}/webservices/protocol/xml"/>
- <mkdir dir="${build.reports}/webservices/protocol/html"/>
+ <mkdir dir="${build.reports}/webservices/adminprotocol/xml"/>
+ <mkdir dir="${build.reports}/webservices/adminprotocol/html"/>
<junit fork="true" dir="${build.tests}" printsummary="on">
<syspropertyset>
@@ -909,17 +918,17 @@
<path refid="tests.run.path"/>
</classpath>
<formatter type="xml"/>
- <batchtest toDir="${build.reports}/webservices/protocol/xml">
- <fileset dir="${build.tests}/WEB-INF/classes">
- <include name="org/apache/roller/weblogger/webservices/protocol/*HandlerTest.class"/>
+ <batchtest toDir="${build.reports}/webservices/adminprotocol/xml">
+ <fileset dir="${build.compile.tests}">
+ <include name="org/apache/roller/weblogger/webservices/adminapi/*HandlerTest.class"/>
</fileset>
</batchtest>
</junit>
- <junitreport todir="${build.reports}/webservices/protocol/xml">
- <fileset dir="${build.reports}/webservices/protocol/xml">
+ <junitreport todir="${build.reports}/webservices/adminprotocol/xml">
+ <fileset dir="${build.reports}/webservices/adminprotocol/xml">
<include name="TEST-*.xml"/>
</fileset>
- <report format="noframes" toDir="${build.reports}/webservices/protocol/html"/>
+ <report format="noframes" toDir="${build.reports}/webservices/adminprotocol/html"/>
</junitreport>
</target>
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/business/jpa/JPAUserManagerImpl.java Tue Sep 11 18:19:11 2007
@@ -266,6 +266,9 @@
public void savePermissions(WeblogPermission perms)
throws WebloggerException {
+ if (getPermissions(perms.getWebsite(), perms.getUser()) != null) {
+ throw new WebloggerException("ERROR: user already has permission in weblog");
+ }
if (getPermissions(perms.getId()) == null) {
// This is a new object make sure that relationship is set on managed
// copy of other side
@@ -700,21 +703,29 @@
StringBuffer whereClause = new StringBuffer();
if (weblog != null) {
- queryString.append("SELECT u FROM User u JOIN u.permissions p WHERE ");
+ queryString.append("SELECT u FROM User u JOIN u.permissions p ");
params.add(size++, weblog);
- whereClause.append(" p.website = ?" + size);
+ whereClause.append(" WHERE p.website = ?" + size);
} else {
- queryString.append("SELECT u FROM User u WHERE ");
+ queryString.append("SELECT u FROM User u ");
}
if (enabled != null) {
- if (whereClause.length() > 0) whereClause.append(" AND ");
+ if (whereClause.length() == 0) {
+ whereClause.append(" WHERE ");
+ } else {
+ whereClause.append(" AND ");
+ }
params.add(size++, enabled);
whereClause.append("u.enabled = ?" + size);
}
if (startDate != null) {
- if (whereClause.length() > 0) whereClause.append(" AND ");
+ if (whereClause.length() == 0) {
+ whereClause.append(" WHERE ");
+ } else {
+ whereClause.append(" AND ");
+ }
// if we are doing date range then we must have an end date
if(endDate == null) {
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerMemberHandler.java Tue Sep 11 18:19:11 2007
@@ -273,6 +273,7 @@
permissionsDatas.add(pd);
}
return toMemberEntrySet((WeblogPermission[])permissionsDatas.toArray(new WeblogPermission[0]));
+
} catch (WebloggerException re) {
throw new InternalException("ERROR: Could not create members", re);
}
@@ -354,23 +355,25 @@
try {
WeblogPermission pd = getPermissionsData(handle, username);
- WeblogPermission[] pds;
+
if (pd == null) {
throw new NotFoundException("ERROR: Permissions do not exist for weblog handle: " + handle + ", user name: " + username);
- }
- pds = new WeblogPermission[] { pd };
-
+ }
UserManager mgr = getRoller().getUserManager();
mgr.removePermissions(pd);
getRoller().flush();
User ud = getUserData(username);
CacheManager.invalidate(ud);
+
Weblog wd = getWebsiteData(handle);
CacheManager.invalidate(wd);
+ // return empty set, entry was deleted
+ WeblogPermission[] pds = new WeblogPermission[0];
EntrySet es = toMemberEntrySet(pds);
return es;
+
} catch (WebloggerException re) {
throw new InternalException("ERROR: Could not delete entry", re);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerUserHandler.java Tue Sep 11 18:19:11 2007
@@ -221,18 +221,20 @@
// don't allow deletion of the currently authenticated user
if (ud.getUserName().equals(getUserName())) {
throw new NotAllowedException("ERROR: Can't delete authenticated user: " + getUserName());
- }
-
- User[] uds = new User[] { ud };
+ }
try {
+ CacheManager.invalidate(ud);
+
getRoller().getUserManager().removeUser(ud);
getRoller().flush();
- CacheManager.invalidate(ud);
+
} catch (WebloggerException re) {
throw new InternalException("ERROR: could not delete user data", re);
}
+ // return empty set, entry was deleted
+ User[] uds = new User[0];
EntrySet es = toUserEntrySet(uds);
return es;
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/RollerWeblogHandler.java Tue Sep 11 18:19:11 2007
@@ -265,14 +265,17 @@
UserManager mgr = getRoller().getUserManager();
Weblog wd = getWebsiteData(handle);
- Weblog[] wds = new Weblog[] { wd };
- EntrySet es = toWeblogEntrySet(wds);
+ CacheManager.invalidate(wd);
+
mgr.removeWebsite(wd);
getRoller().flush();
- CacheManager.invalidate(wd);
-
+
+ // return empty set, object deleted
+ Weblog[] wds = new Weblog[0];
+ EntrySet es = toWeblogEntrySet(wds);
return es;
+
} catch (WebloggerException re) {
throw new InternalException("ERROR: Could not delete entry: " + handle, re);
}
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/webservices/adminprotocol/sdk/UserEntry.java Tue Sep 11 18:19:11 2007
@@ -96,6 +96,12 @@
setFullName(fullNameElement.getText());
}
+ // screenname
+ Element screenNameElement = e.getChild(Tags.SCREEN_NAME, NAMESPACE);
+ if (screenNameElement != null) {
+ setScreenName(screenNameElement.getText());
+ }
+
// password
Element passwordElement = e.getChild(Tags.PASSWORD, NAMESPACE);
if (passwordElement != null) {
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/AappTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/AappTest.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/AappTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/AappTest.java Tue Sep 11 18:19:11 2007
@@ -30,9 +30,9 @@
public abstract class AappTest extends TestCase {
private static final Date sampleDate = new Date();
- private static final String DEFAULT_ENDPOINT_URL = "http://localhost:8080/roller/roller-services/aapp";
- private static final String DEFAULT_USER = "jtb";
- private static final String DEFAULT_PASSWORD = "iplanet";
+ private static final String DEFAULT_ENDPOINT_URL = "http://localhost:8080/roller/roller-services/rap";
+ private static final String DEFAULT_USER = "admin";
+ private static final String DEFAULT_PASSWORD = "admin";
protected static String getEndpointUrl() {
String endpoint = System.getProperty("aapp.endpoint");
@@ -68,6 +68,7 @@
UserEntry ue = new UserEntry("foo", getEndpointUrl());
ue.setEmailAddress("foo@bar.org");
ue.setFullName("Foo Bar");
+ ue.setScreenName("foobar");
ue.setLocale(Locale.getDefault());
ue.setTimezone(TimeZone.getDefault());
ue.setPassword("foo");
@@ -86,6 +87,7 @@
UserEntry ueUpdate = new UserEntry(ue.getName(), getEndpointUrl());
ueUpdate.setEmailAddress("billy@bob.org");
ueUpdate.setFullName("Billy Bob");
+ ueUpdate.setScreenName("billybob");
ueUpdate.setLocale(new Locale("ms", "MY"));
ueUpdate.setTimezone(TimeZone.getTimeZone("Asia/Kuala_Lumpur"));
ueUpdate.setPassword("billy");
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/MemberHandlerTest.java Tue Sep 11 18:19:11 2007
@@ -28,6 +28,11 @@
createSampleUser();
createSampleWeblog();
+ // delete user-weblog permission
+ MemberEntrySet mesDelete = deleteSampleMember(true);
+ assertNotNull(mesDelete);
+ assertEquals(0, mesDelete.getEntries().length);
+
//create
MemberEntrySet mesCreate = createSampleMember();
assertNotNull(mesCreate);
@@ -50,11 +55,12 @@
assertEquals(mesUpdate, updateSampleMemberEntrySet(getSampleMemberEntrySet()));
//delete
- MemberEntrySet mesDelete = deleteSampleMember(true);
+ mesDelete = deleteSampleMember(true);
assertNotNull(mesDelete);
assertNotNull(mesCreate.getEntries());
assertEquals(mesCreate.getEntries().length, 1);
- assertEquals(mesDelete, mesUpdate);
+ assertEquals(0, mesDelete.getEntries().length);
+
} catch (IOException ioe) {
ioe.printStackTrace();
fail(ioe.getMessage());
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/UserHandlerTest.java Tue Sep 11 18:19:11 2007
@@ -56,7 +56,8 @@
assertNotNull(uesDelete);
assertNotNull(uesCreate.getEntries());
assertEquals(uesCreate.getEntries().length, 1);
- assertEquals(uesDelete, uesUpdate);
+ assertEquals(0, uesDelete.getEntries().length);
+
} catch (IOException ioe) {
ioe.printStackTrace();
fail(ioe.getMessage());
@@ -82,6 +83,7 @@
ues = fetchSampleUser();
ue = (UserEntry)ues.getEntries()[0];
assertEquals(Boolean.FALSE, ue.getEnabled());
+
} catch (IOException ioe) {
fail(ioe.getMessage());
ioe.printStackTrace();
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/WeblogHandlerTest.java Tue Sep 11 18:19:11 2007
@@ -54,7 +54,8 @@
assertNotNull(wesDelete);
assertNotNull(wesCreate.getEntries());
assertEquals(wesCreate.getEntries().length, 1);
- assertEquals(wesDelete, wesUpdate);
+ assertEquals(0, wesDelete.getEntries().length);
+
} catch (IOException ioe) {
fail(ioe.getMessage());
ioe.printStackTrace();
Modified: roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/README.txt
URL: http://svn.apache.org/viewvc/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/README.txt?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/README.txt (original)
+++ roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/README.txt Tue Sep 11 18:19:11 2007
@@ -8,17 +8,16 @@
1) Have Groovy 1.0 installed on your system
-2) Put the RAP SDK, JDOM and Commons Codec jars in your classpath.
- For example:
+2) Put the RAP SDK, JDOM and Commons Codec jars in your classpath. For example:
$ export CLASSPATH=./lib/jdom.jar:./lib/roller-rap-sdk.jar:./lib/commons-codec-1.3.jar
Once you've done that you can run the scripts like so:
- $ groovy rap.gy <username> <password> <endpoint-url>
+ $ groovy <script> <username> <password> <endpoint-url>
For example:
- $ groovy rap.gy admin admin http://localhost:8080/roller/roller-services/rap
+ $ groovy listusers.gy admin admin http://localhost:8080/roller/roller-services/rap
Modified: roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/lib/roller-rap-sdk.jar
URL: http://svn.apache.org/viewvc/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/lib/roller-rap-sdk.jar?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listcollections.gy
URL: http://svn.apache.org/viewvc/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listcollections.gy?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listcollections.gy (original)
+++ roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listcollections.gy Tue Sep 11 18:19:11 2007
@@ -2,7 +2,7 @@
import java.io.*;
import java.net.*;
import org.apache.commons.codec.binary.Base64;
-import org.apache.roller.webservices.adminprotocol.sdk.*;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.*;
if (args.length < 3) {
println "USAGE: groovy listcollections.gy <username> <password> <rap-endpoint-uri>";
Modified: roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listusers.gy
URL: http://svn.apache.org/viewvc/roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listusers.gy?rev=574744&r1=574743&r2=574744&view=diff
==============================================================================
--- roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listusers.gy (original)
+++ roller/trunk/sandbox/scripting/groovy/examples/adminprotocol/listusers.gy Tue Sep 11 18:19:11 2007
@@ -2,10 +2,10 @@
import java.io.*;
import java.net.*;
import org.apache.commons.codec.binary.Base64;
-import org.apache.roller.webservices.adminprotocol.sdk.*;
+import org.apache.roller.weblogger.webservices.adminprotocol.sdk.*;
if (args.length < 3) {
- println "USAGE: groovy listcollections.gy <username> <password> <rap-endpoint-uri>";
+ println "USAGE: groovy listusers.gy <username> <password> <rap-endpoint-uri>";
return;
}
username = args[0];