[jboss-svn-commits] JBL Code SVN: r23615 - in labs/jbossrules/trunk/drools-atom/src: test/java/org/drools/atom and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 29 05:59:41 EDT 2008
Author: jervisliu
Date: 2008-10-29 05:59:41 -0400 (Wed, 29 Oct 2008)
New Revision: 23615
Added:
labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/ResourceNotFoundDetails.java
labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/ResourceNotFoundFault.java
Removed:
labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/PackageNotFoundDetails.java
labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/PackageNotFoundFault.java
Modified:
labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/AtomRulesRepository.java
labs/jbossrules/trunk/drools-atom/src/test/java/org/drools/atom/AtomRulesRepositoryServer.java
labs/jbossrules/trunk/drools-atom/src/test/java/org/drools/atom/ClientServerAtomRulesRepositoryTest.java
Log:
return rules' content in string format using atom <content> element.
Modified: labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/AtomRulesRepository.java
===================================================================
--- labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/AtomRulesRepository.java 2008-10-29 06:07:51 UTC (rev 23614)
+++ labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/AtomRulesRepository.java 2008-10-29 09:59:41 UTC (rev 23615)
@@ -182,16 +182,16 @@
@GET
@Path("/packages/{packageName}")
@ProduceMime({"application/atom+xml"})
- public Entry getPackageAsEntry(@PathParam("packageName") String packageName, @Context UriInfo uParam) throws PackageNotFoundFault {
+ public Entry getPackageAsEntry(@PathParam("packageName") String packageName, @Context UriInfo uParam) throws ResourceNotFoundFault {
System.out.println("----invoking getPackageAsEntry with packageName: " + packageName);
try {
PackageItem packageItem = repository.loadPackage(packageName);
return createDetailedPackageItemEntry(packageItem, uParam);
} catch (RulesRepositoryException e) {
- PackageNotFoundDetails details = new PackageNotFoundDetails();
+ ResourceNotFoundDetails details = new ResourceNotFoundDetails();
details.setName(packageName);
- throw new PackageNotFoundFault(details);
+ throw new ResourceNotFoundFault(details);
}
}
@@ -200,7 +200,7 @@
@ProduceMime({"application/atom+xml"})
public Entry getAssetAsEntry(@PathParam("packageName") String packageName,
@Context UriInfo uParam,
- @PathParam("assetName") String assetName) throws PackageNotFoundFault {
+ @PathParam("assetName") String assetName) throws ResourceNotFoundFault {
System.out.println("----invoking getPackageAsEntry with packageName: " + packageName + ", assetName: " + assetName);
try {
@@ -212,15 +212,15 @@
}
}
} catch (RulesRepositoryException e) {
- PackageNotFoundDetails details = new PackageNotFoundDetails();
+ ResourceNotFoundDetails details = new ResourceNotFoundDetails();
details.setName(packageName);
- throw new PackageNotFoundFault(details);
+ throw new ResourceNotFoundFault(details);
}
//TODO: Better exception handling
- PackageNotFoundDetails details = new PackageNotFoundDetails();
+ ResourceNotFoundDetails details = new ResourceNotFoundDetails();
details.setName(assetName);
- throw new PackageNotFoundFault(details);
+ throw new ResourceNotFoundFault(details);
}
@POST
@@ -337,11 +337,6 @@
e.addLink(uri.toString());
e.setUpdated(pkg.getLastModified().getTime());
- //TODO: What content to return?
- e.setContentElement(factory.newContent());
- e.getContentElement().setContentType(Content.Type.TEXT);
- e.getContentElement().setValue("archived=" + pkg.isArchived());
-
return e;
}
@@ -362,10 +357,13 @@
e.addLink(uri.toString());
e.setUpdated(asset.getLastModified().getTime());
- //TODO: What content to return?
- e.setContentElement(factory.newContent());
- e.getContentElement().setContentType(Content.Type.TEXT);
- e.getContentElement().setValue("archived=" + asset.isArchived());
+ if (!asset.isBinary()) {
+ e.setContentElement(factory.newContent());
+ e.getContentElement().setContentType(Content.Type.TEXT);
+ e.getContentElement().setValue(asset.getContent());
+ } else {
+ // TODO: binary content
+ }
return e;
}
Deleted: labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/PackageNotFoundDetails.java
===================================================================
--- labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/PackageNotFoundDetails.java 2008-10-29 06:07:51 UTC (rev 23614)
+++ labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/PackageNotFoundDetails.java 2008-10-29 09:59:41 UTC (rev 23615)
@@ -1,17 +0,0 @@
-package org.drools.atom;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
- at XmlRootElement
-public class PackageNotFoundDetails {
- private String name;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/PackageNotFoundFault.java
===================================================================
--- labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/PackageNotFoundFault.java 2008-10-29 06:07:51 UTC (rev 23614)
+++ labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/PackageNotFoundFault.java 2008-10-29 09:59:41 UTC (rev 23615)
@@ -1,17 +0,0 @@
-package org.drools.atom;
-
-import javax.xml.ws.WebFault;
-
- at WebFault
-public class PackageNotFoundFault extends Exception {
- private PackageNotFoundDetails details;
-
- public PackageNotFoundFault(PackageNotFoundDetails details) {
- super();
- this.details = details;
- }
-
- public PackageNotFoundDetails getFaultInfo() {
- return details;
- }
-}
Added: labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/ResourceNotFoundDetails.java
===================================================================
--- labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/ResourceNotFoundDetails.java (rev 0)
+++ labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/ResourceNotFoundDetails.java 2008-10-29 09:59:41 UTC (rev 23615)
@@ -0,0 +1,17 @@
+package org.drools.atom;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+ at XmlRootElement
+public class ResourceNotFoundDetails {
+ private String name;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/ResourceNotFoundFault.java
===================================================================
--- labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/ResourceNotFoundFault.java (rev 0)
+++ labs/jbossrules/trunk/drools-atom/src/main/java/org/drools/atom/ResourceNotFoundFault.java 2008-10-29 09:59:41 UTC (rev 23615)
@@ -0,0 +1,17 @@
+package org.drools.atom;
+
+import javax.xml.ws.WebFault;
+
+ at WebFault
+public class ResourceNotFoundFault extends Exception {
+ private ResourceNotFoundDetails details;
+
+ public ResourceNotFoundFault(ResourceNotFoundDetails details) {
+ super();
+ this.details = details;
+ }
+
+ public ResourceNotFoundDetails getFaultInfo() {
+ return details;
+ }
+}
Modified: labs/jbossrules/trunk/drools-atom/src/test/java/org/drools/atom/AtomRulesRepositoryServer.java
===================================================================
--- labs/jbossrules/trunk/drools-atom/src/test/java/org/drools/atom/AtomRulesRepositoryServer.java 2008-10-29 06:07:51 UTC (rev 23614)
+++ labs/jbossrules/trunk/drools-atom/src/test/java/org/drools/atom/AtomRulesRepositoryServer.java 2008-10-29 09:59:41 UTC (rev 23615)
@@ -9,6 +9,7 @@
import org.apache.cxf.jaxrs.provider.AtomEntryProvider;
import org.apache.cxf.jaxrs.provider.AtomFeedProvider;
import org.apache.cxf.testutil.common.AbstractTestServerBase;
+import org.drools.repository.AssetItem;
import org.drools.repository.PackageItem;
import org.drools.repository.RepositorySessionUtil;
import org.drools.repository.RulesRepository;
@@ -28,8 +29,10 @@
repo = RepositorySessionUtil.getRepository();
PackageItem pkg = repo.createPackage("testPackage1", "desc1");
repo.loadCategory( "/" ).addCategory( "AtomRulesRepositoryTestCat", "X" );
- pkg.addAsset( "testAsset1", "testAsset1Desc1", "/AtomRulesRepositoryTestCat", "drl");
- pkg.addAsset( "testAsset2", "testAsset2Desc1", "/AtomRulesRepositoryTestCat", "drl");
+ AssetItem testAsset1 = pkg.addAsset( "testAsset1", "testAsset1Desc1", "/AtomRulesRepositoryTestCat", "drl");
+ testAsset1.updateContent("a new test rule for testAsset1");
+ AssetItem testAsset2 = pkg.addAsset( "testAsset2", "testAsset2Desc1", "/AtomRulesRepositoryTestCat", "drl");
+ testAsset2.updateContent("a new test rule for testAsset2");
repo.save();
Modified: labs/jbossrules/trunk/drools-atom/src/test/java/org/drools/atom/ClientServerAtomRulesRepositoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-atom/src/test/java/org/drools/atom/ClientServerAtomRulesRepositoryTest.java 2008-10-29 06:07:51 UTC (rev 23614)
+++ labs/jbossrules/trunk/drools-atom/src/test/java/org/drools/atom/ClientServerAtomRulesRepositoryTest.java 2008-10-29 09:59:41 UTC (rev 23615)
@@ -117,9 +117,8 @@
httpClient.executeMethod(get);
String response = getStringFromInputStream(get.getResponseBodyAsStream());
//System.out.print(response);
- assertTrue(response.indexOf("testPackage1") > 0);
- assertTrue(response.indexOf("desc1") > 0);
- assertTrue(response.indexOf("archived=false") > 0);
+ assertTrue(response.indexOf("testPackage1</title>") > 0);
+ assertTrue(response.indexOf("desc1</summary>") > 0);
} finally {
get.releaseConnection();
}
@@ -137,9 +136,9 @@
httpClient.executeMethod(get);
String response = getStringFromInputStream(get.getResponseBodyAsStream());
//System.out.print(response);
- assertTrue(response.indexOf("testAsset1") > 0);
- assertTrue(response.indexOf("testAsset1Desc1") > 0);
- assertTrue(response.indexOf("archived=false") > 0);
+ assertTrue(response.indexOf("testAsset1</title>") > 0);
+ assertTrue(response.indexOf("testAsset1Desc1</summary>") > 0);
+ assertTrue(response.indexOf("a new test rule for testAsset1</content>") > 0);
} finally {
get.releaseConnection();
}
@@ -180,7 +179,7 @@
httpClient2.executeMethod(get2);
String response = getStringFromInputStream(get2.getResponseBodyAsStream());
//System.out.print(response);
- assertTrue(response.indexOf("testPackage2") > 0);
+ assertTrue(response.indexOf("testPackage2</title>") > 0);
} finally {
get2.releaseConnection();
}
@@ -203,7 +202,7 @@
httpClient4.executeMethod(get4);
String response = getStringFromInputStream(get4.getResponseBodyAsStream());
//System.out.print(response);
- assertTrue(response.indexOf("org.drools.atom.PackageNotFoundFault") > 0);
+ assertTrue(response.indexOf("org.drools.atom.ResourceNotFoundFault") > 0);
} finally {
get4.releaseConnection();
}
@@ -236,7 +235,7 @@
InputStream in = connect.getInputStream();
assertNotNull(in);
String response = getStringFromInputStream(in);
- assertTrue(response.indexOf("esc2") > 0);
+ assertTrue(response.indexOf("desc2</summary>") > 0);
// Roll back changes:
File input1 = new File(getClass().getResource("resources/expected_get_testPackage1.txt").toURI());
More information about the jboss-svn-commits
mailing list