[jboss-svn-commits] JBL Code SVN: r11877 - in labs/jbossrules/trunk/drools-jbrms/src: main/java/org/drools/brms/server/builder and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed May 16 03:59:43 EDT 2007
Author: michael.neale at jboss.com
Date: 2007-05-16 03:59:43 -0400 (Wed, 16 May 2007)
New Revision: 11877
Modified:
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/welcome.html
labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java
labs/jbossrules/trunk/drools-jbrms/src/main/webapp/WEB-INF/web.xml
labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder/ContentPackageAssemblerTest.java
Log:
JBRULES-853
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/welcome.html
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/welcome.html 2007-05-16 07:31:42 UTC (rev 11876)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/public/welcome.html 2007-05-16 07:59:43 UTC (rev 11877)
@@ -10,6 +10,7 @@
<li><a href="http://www.jboss.com/products/rules">Product home page</a></li>
<li><a href="http://labs.jboss.com/jbossrules">Community home page</a></li>
<li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBossRules">Wiki</a></li>
+ <li><a href="http://jira.jboss.com/jira/browse/JBRULES">Bugs and feature requests</li>
</ul>
</body>
</html>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java 2007-05-16 07:31:42 UTC (rev 11876)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/java/org/drools/brms/server/builder/ContentPackageAssembler.java 2007-05-16 07:59:43 UTC (rev 11877)
@@ -79,8 +79,11 @@
private void buildPackage() {
Iterator it = pkg.getAssets();
while (it.hasNext()) {
+
AssetItem asset = (AssetItem) it.next();
- buildAsset( asset );
+ if (!asset.isArchived()) {
+ buildAsset( asset );
+ }
}
}
Modified: labs/jbossrules/trunk/drools-jbrms/src/main/webapp/WEB-INF/web.xml
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/main/webapp/WEB-INF/web.xml 2007-05-16 07:31:42 UTC (rev 11876)
+++ labs/jbossrules/trunk/drools-jbrms/src/main/webapp/WEB-INF/web.xml 2007-05-16 07:59:43 UTC (rev 11877)
@@ -50,48 +50,5 @@
<servlet-name>RepositoryBackupServlet</servlet-name>
<url-pattern>/org.drools.brms.JBRMS/backup</url-pattern>
</servlet-mapping>
-
- <!-- following are security constraints, this can be modified to suit your environment -->
- <!-- ************ Uncomment to enable security
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>JBRMS Protected Area</web-resource-name>
- <url-pattern>/index.jsp</url-pattern>
- <url-pattern>/login.jsp</url-pattern>
- <url-pattern>/org.drools.brms.JBRMS/*</url-pattern>
- <http-method>HEAD</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>AdminRol</role-name>
- <role-name>UserRol</role-name>
- </auth-constraint>
-
- <user-data-constraint>
- <description>no description</description>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
-
- </security-constraint>
- <login-config>
- <auth-method>FORM</auth-method>
- <form-login-config>
- <form-login-page>/login.jsp</form-login-page>
- <form-error-page>/login.jsp?error=1</form-error-page>
- </form-login-config>
- </login-config>
- <security-role>
- <description>Admin user access</description>
- <role-name>AdminRol</role-name>
- </security-role>
- <security-role>
- <description>General user access</description>
- <role-name>UserRol</role-name>
- </security-role>
--->
-
</web-app>
Modified: labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder/ContentPackageAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder/ContentPackageAssemblerTest.java 2007-05-16 07:31:42 UTC (rev 11876)
+++ labs/jbossrules/trunk/drools-jbrms/src/test/java/org/drools/brms/server/builder/ContentPackageAssemblerTest.java 2007-05-16 07:59:43 UTC (rev 11877)
@@ -165,6 +165,44 @@
}
+ public void testIgnoreArchivedItems() throws Exception {
+ RulesRepository repo = getRepo();
+
+ PackageItem pkg = repo.createPackage( "testIgnoreArchivedItems", "" );
+ AssetItem model = pkg.addAsset( "model", "qed" );
+ model.updateFormat( AssetFormats.MODEL );
+
+ model.updateBinaryContentAttachment( this.getClass().getResourceAsStream( "/billasurf.jar" ) );
+ model.checkin( "" );
+
+ pkg.updateHeader( "import com.billasurf.Board\n global com.billasurf.Person customer" );
+
+ AssetItem rule1 = pkg.addAsset( "rule_1", "" );
+ rule1.updateFormat( AssetFormats.DRL );
+ rule1.updateContent( "rule 'rule1' \n when Board() \n then customer.setAge(42); \n end");
+ rule1.checkin( "" );
+
+ AssetItem rule2 = pkg.addAsset( "rule2", "" );
+ rule2.updateFormat( AssetFormats.DRL );
+ rule2.updateContent( "agenda-group 'q' \n when \n Boardx() \n then \n System.err.println(42);" );
+ rule2.checkin( "" );
+
+ repo.save();
+
+
+ ContentPackageAssembler asm = new ContentPackageAssembler(pkg);
+ assertTrue(asm.hasErrors());
+
+ rule2.archiveItem( true );
+ rule2.checkin( "" );
+
+ assertTrue(rule2.isArchived());
+ asm = new ContentPackageAssembler(pkg);
+ assertFalse(asm.hasErrors());
+
+
+ }
+
/**
* This this case we will test errors that occur in rule assets,
* not in functions or package header.
More information about the jboss-svn-commits
mailing list