[jboss-svn-commits] JBL Code SVN: r31850 - in labs/jbossrules/trunk/drools-guvnor/src: test/java/org/drools/guvnor/server/contenthandler and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: jervisliu
Date: 2010-02-26 05:37:49 -0500 (Fri, 26 Feb 2010)
New Revision: 31850

Added:
   labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java
   labs/jbossrules/trunk/drools-guvnor/src/test/resources/org/drools/guvnor/server/contenthandler/
   labs/jbossrules/trunk/drools-guvnor/src/test/resources/org/drools/guvnor/server/contenthandler/domain.objects-1.1.8.jar
Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
Log:
https://jira.jboss.org/jira/browse/GUVNOR-508: When importing model jars package-info.java should be excluded from generated imported types

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2010-02-26 10:28:57 UTC (rev 31849)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2010-02-26 10:37:49 UTC (rev 31850)
@@ -65,7 +65,8 @@
         JarEntry entry = null;
         while ( (entry = jis.getNextJarEntry()) != null ) {
             if ( !entry.isDirectory() ) {
-                if ( entry.getName().endsWith( ".class" ) && entry.getName().indexOf( '$' ) == -1 ) {
+                if ( entry.getName().endsWith( ".class" ) && entry.getName().indexOf( '$' ) == -1 
+                		&& !entry.getName().endsWith( "package-info.class" )) {
 
                     String line = "import " + convertPathToName( entry.getName() );
                     // Add imports only once

Added: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java	2010-02-26 10:37:49 UTC (rev 31850)
@@ -0,0 +1,39 @@
+package org.drools.guvnor.server.contenthandler;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.drools.compiler.DroolsParserException;
+import org.drools.guvnor.client.factmodel.FactMetaModel;
+import org.drools.guvnor.client.factmodel.FactModels;
+import org.drools.guvnor.client.factmodel.FieldMetaModel;
+import org.drools.guvnor.client.rpc.RuleAsset;
+import org.drools.guvnor.client.rpc.RuleContentText;
+import org.drools.guvnor.server.ServiceImplementation;
+import org.drools.guvnor.server.util.TestEnvironmentSessionHelper;
+import org.drools.repository.AssetItem;
+import org.drools.repository.PackageItem;
+import org.drools.repository.RulesRepository;
+
+public class ModelContentHandlerTest extends TestCase {
+
+    public void testModelAttached() throws Exception {
+        RulesRepository repo = new RulesRepository( TestEnvironmentSessionHelper.getSession() );
+        PackageItem pacakge = repo.createPackage("testModelAttachedPack", "for test");
+        AssetItem asset = pacakge.addAsset("testModelAttachedAsset", "description");
+        
+        InputStream is = this.getClass().getResourceAsStream("domain.objects-1.1.8.jar");
+        asset.updateBinaryContentAttachment(is);
+        
+        ModelContentHandler modelContentHandler = new ModelContentHandler();
+        modelContentHandler.modelAttached(asset);
+
+        String header = ServiceImplementation.getDroolsHeader( pacakge );
+        assertTrue(header.indexOf("package-info.class") == -1);
+    }
+
+ }
+


Property changes on: labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/contenthandler/ModelContentHandlerTest.java
___________________________________________________________________
Name: svn:keywords
   + Rev Date
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/drools-guvnor/src/test/resources/org/drools/guvnor/server/contenthandler/domain.objects-1.1.8.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/drools-guvnor/src/test/resources/org/drools/guvnor/server/contenthandler/domain.objects-1.1.8.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream