[jboss-svn-commits] JBL Code SVN: r28297 - in labs/jbossrules/trunk/drools-guvnor/src: main/java/org/drools/guvnor/client/packages and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 22 02:12:12 EDT 2009
Author: michael.neale at jboss.com
Date: 2009-07-22 02:12:11 -0400 (Wed, 22 Jul 2009)
New Revision: 28297
Modified:
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_zh_CN.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
Log:
GUVNOR-417 changeset generation
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.java 2009-07-22 06:12:11 UTC (rev 28297)
@@ -1880,4 +1880,8 @@
String SavedOK();
String Actions();
+
+ String ChangeSet();
+
+ String URLToChangeSetForDeploymentAgents();
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2009-07-22 06:12:11 UTC (rev 28297)
@@ -892,4 +892,6 @@
ImportedDRLContainsNoNameForThePackage=Imported DRL contains no name for the package. Please name the package.
InitialisingInfoFor0PleaseWait=Initialising info for {0}, please wait...
SavedOK=(Saved OK)
-Actions=Actions...
\ No newline at end of file
+Actions=Actions...
+ChangeSet=Change Set:
+URLToChangeSetForDeploymentAgents=URL to change set for deployment agents.
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties 2009-07-22 06:12:11 UTC (rev 28297)
@@ -865,4 +865,6 @@
ImportedDRLContainsNoNameForThePackage=Imported DRL contains no name for the package. Please name the package.
InitialisingInfoFor0PleaseWait=Initialising info for {0}, please wait...
SavedOK=Saved OK
-Actions=Actions...
\ No newline at end of file
+Actions=Actions...
+ChangeSet=Change Set:
+URLToChangeSetForDeploymentAgents=URL to change set for deployment agents.
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties 2009-07-22 06:12:11 UTC (rev 28297)
@@ -885,4 +885,6 @@
ImportedDRLContainsNoNameForThePackage=Imported DRL contains no name for the package. Please name the package.
InitialisingInfoFor0PleaseWait=Initialising info for {0}, please wait...
SavedOK=Saved OK
-Actions=Actions...
\ No newline at end of file
+Actions=Actions...
+ChangeSet=Change Set:
+URLToChangeSetForDeploymentAgents=URL to change set for deployment agents.
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_zh_CN.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_zh_CN.properties 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_zh_CN.properties 2009-07-22 06:12:11 UTC (rev 28297)
@@ -1692,4 +1692,6 @@
ImportedDRLContainsNoNameForThePackage=Imported DRL contains no name for the package. Please name the package.
InitialisingInfoFor0PleaseWait=Initialising info for {0}, please wait...
SavedOK=Saved OK
-Actions=Actions...
\ No newline at end of file
+Actions=Actions...
+ChangeSet=Change Set:
+URLToChangeSetForDeploymentAgents=URL to change set for deployment agents.
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/packages/PackageEditor2.java 2009-07-22 06:12:11 UTC (rev 28297)
@@ -163,8 +163,14 @@
+ "' target='_blank'>" + getScenarios(this.conf) + "</a>");
addAttribute(constants.URLForRunningTests(), h(html3, constants.URLRunTestsRemote()));
+ HTML html4 = new HTML("<a href='" + getChangeset(this.conf)
+ + "' target='_blank'>" + getChangeset(this.conf) + "</a>");
+
+ addAttribute(constants.ChangeSet(), h(html4, constants.URLToChangeSetForDeploymentAgents()));
+
+
status = new HTML();
HorizontalPanel statusBar = new HorizontalPanel();
Image editState = new ImageButton("images/edit.gif"); //NON-NLS
@@ -334,9 +340,13 @@
return makeLink (conf) + "/SCENARIOS"; //NON-NLS
}
+ static String getChangeset(PackageConfigData conf) {
+ return makeLink (conf) + "/ChangeSet.xml"; //NON-NLS
+ }
+
/**
* Get a download link for the binary package.
*/
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/PackageDeploymentServlet.java 2009-07-22 06:12:11 UTC (rev 28297)
@@ -137,7 +137,20 @@
} else {
if (req.getRequestURI().endsWith("SCENARIOS")) {
doRunScenarios(helper, out);
- } else {
+ } else if (req.getRequestURI().endsWith("ChangeSet.xml")) {
+ //here be dragons !
+ String url = req.getRequestURL().toString().replace("/ChangeSet.xml", "");
+ fileName = "ChangeSet.xml";
+ String xml = "";
+ xml += "<change-set xmlns='http://drools.org/drools-5.0/change-set'\n";
+ xml += " xmlns:xs='http://www.w3.org/2001/XMLSchema-instance'\n";
+ xml += " xs:schemaLocation='http://drools.org/drools-5.0/change-set drools-change-set-5.0.xsd' >\n";
+ xml += " <add>\n ";
+ xml += " <resource source='" + url +"' type='PKG' />\n";
+ xml += " </add>\n";
+ xml += "</change-set>";
+ out.write(xml.getBytes());
+ } else {
fileName = fm.loadBinaryPackage( helper.getPackageName(), helper.getVersion(), helper.isLatest(), out );
}
}
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/MockHTTPRequest.java 2009-07-22 06:12:11 UTC (rev 28297)
@@ -24,7 +24,9 @@
Map<String, String> parameters;
public String method;
+ public StringBuffer url = new StringBuffer("http://foo.com");
+
public MockHTTPRequest(String uri, Map<String, String> headers) {
this.uri = uri;
this.headers = headers;
@@ -111,7 +113,8 @@
public StringBuffer getRequestURL() {
- return new StringBuffer("http://foo.com");
+ return url;
+
}
public String getRequestedSessionId() {
Modified: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java 2009-07-22 06:09:20 UTC (rev 28296)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/files/PackageDeploymentServletTest.java 2009-07-22 06:12:11 UTC (rev 28297)
@@ -245,20 +245,12 @@
assertEquals(2, kp.getRules().size());
-
-
-
-
server.stop();
-
-
repo.logout();
-
-
}
- public void testScenarios() throws Exception {
+ public void testScenariosAndChangeSet() throws Exception {
RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession( true ) );
ServiceImplementation impl = new ServiceImplementation();
@@ -288,6 +280,19 @@
assertNotNull(testResult);
assertEquals("No test scenarios found.", testResult);
+
+ serv = new PackageDeploymentServlet();
+ req = new MockHTTPRequest("/package/testScenariosURL/SNAP1/ChangeSet.xml", null);
+ req.url = new StringBuffer("http://foo/ChangeSet.xml");
+ out = new ByteArrayOutputStream();
+ res = new MockHTTPResponse(out);
+
+ serv.doGet(req, res);
+ testResult = new String(out.toByteArray());
+ assertNotNull(testResult);
+ assertTrue(testResult.indexOf("<resource source='http://foo' type='PKG' />") > 0);
+
+
}
private void assertSameArray(byte[] bin_, byte[] bin) {
More information about the jboss-svn-commits
mailing list