[jboss-cvs] JBossAS SVN: r70574 - in projects/microcontainer/trunk/reliance-rules: src/main/org/jboss/reliance/drools/core and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Mar 8 06:13:13 EST 2008
Author: adrian at jboss.org
Date: 2008-03-08 06:13:13 -0500 (Sat, 08 Mar 2008)
New Revision: 70574
Modified:
projects/microcontainer/trunk/reliance-rules/.classpath
projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/ConstantsKernelGlobalResolver.java
projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/KernelGlobalResolver.java
projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/NamingKernelGlobalResolver.java
projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/RuleBaseBean.java
projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/aspects/FireAllRulesAspect.java
projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/security/PermissionCheck.java
projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/security/RuleBasedIdentity.java
projects/microcontainer/trunk/reliance-rules/src/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.java
Log:
Source code tidyup
Modified: projects/microcontainer/trunk/reliance-rules/.classpath
===================================================================
--- projects/microcontainer/trunk/reliance-rules/.classpath 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/.classpath 2008-03-08 11:13:13 UTC (rev 70574)
@@ -5,9 +5,9 @@
<classpathentry kind="src" path="src/tests" output="target/tests-classes"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA.jar" sourcepath="M2_REPO/jboss/jboss-logging-spi/2.0.3.GA/jboss-logging-spi-2.0.3.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
+ <classpathentry kind="src" path="/jboss-aop-mc-int"/>
+ <classpathentry kind="src" path="/jboss-deployers-vfs"/>
+ <classpathentry kind="src" path="/jboss-reliance-identity"/>
<classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/4.0.1/drools-compiler-4.0.1.jar" sourcepath="M2_REPO/org/drools/drools-compiler/4.0.1/drools-compiler-4.0.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/drools/drools-core/4.0.1/drools-core-4.0.1.jar" sourcepath="M2_REPO/org/drools/drools-core/4.0.1/drools-core-4.0.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mvel/mvel14/1.2rc4rv908/mvel14-1.2rc4rv908.jar"/>
@@ -16,43 +16,4 @@
<classpathentry kind="var" path="M2_REPO/janino/janino/2.5.7/janino-2.5.7.jar"/>
<classpathentry kind="var" path="M2_REPO/org/drools/drools-decisiontables/4.0.1/drools-decisiontables-4.0.1.jar" sourcepath="M2_REPO/org/drools/drools-decisiontables/4.0.1/drools-decisiontables-4.0.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA.jar" sourcepath="M2_REPO/org/jboss/jboss-test/1.0.4.GA/jboss-test-1.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-log4j/2.0.4.GA/jboss-common-logging-log4j-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.Beta7/jboss-vfs-2.0.0.Beta7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.3.GA/jboss-common-core-2.2.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar" sourcepath="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.0.0.CR3/jboss-aop-2.0.0.CR3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA.jar" sourcepath="M2_REPO/org/jboss/javassist/3.6.0.GA/javassist-3.6.0.GA-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6/qdox-1.6.jar" sourcepath="M2_REPO/qdox/qdox/1.6/qdox-1.6-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="src" path="/jboss-aop-mc-int"/>
- <classpathentry kind="src" path="/jboss-kernel"/>
- <classpathentry kind="src" path="/jboss-dependency"/>
- <classpathentry kind="src" path="/jboss-container"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.0.2/activation-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR6/jbossxb-2.0.0.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="src" path="/jboss-managed"/>
- <classpathentry kind="src" path="/jboss-metatype"/>
- <classpathentry kind="src" path="/jboss-deployers-vfs"/>
- <classpathentry kind="src" path="/jboss-deployers-core-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-client"/>
- <classpathentry kind="src" path="/jboss-deployers-client-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-vfs-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-structure-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-core"/>
- <classpathentry kind="src" path="/jboss-deployers-spi"/>
- <classpathentry kind="src" path="/jboss-deployers-impl"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3.jar" sourcepath="M2_REPO/org/jboss/jboss-classloading-spi/5.0.0.Beta3/jboss-classloading-spi-5.0.0.Beta3-sources.jar"/>
- <classpathentry kind="src" path="/jboss-classloader"/>
- <classpathentry kind="src" path="/jboss-reliance-identity"/>
</classpath>
Modified: projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/ConstantsKernelGlobalResolver.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/ConstantsKernelGlobalResolver.java 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/ConstantsKernelGlobalResolver.java 2008-03-08 11:13:13 UTC (rev 70574)
@@ -35,6 +35,9 @@
*/
public class ConstantsKernelGlobalResolver extends NamingKernelGlobalResolver
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 7961923417779473095L;
+
public ConstantsKernelGlobalResolver(GlobalResolver delegate, Controller controller)
{
super(delegate, controller);
Modified: projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/KernelGlobalResolver.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/KernelGlobalResolver.java 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/KernelGlobalResolver.java 2008-03-08 11:13:13 UTC (rev 70574)
@@ -32,6 +32,9 @@
*/
public class KernelGlobalResolver implements GlobalResolver
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 8717911664770177777L
+ ;
private GlobalResolver delegate;
private Controller controller;
Modified: projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/NamingKernelGlobalResolver.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/NamingKernelGlobalResolver.java 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/NamingKernelGlobalResolver.java 2008-03-08 11:13:13 UTC (rev 70574)
@@ -34,6 +34,9 @@
*/
public class NamingKernelGlobalResolver extends KernelGlobalResolver
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 647237007123208771L
+ ;
private Map<String, String> names = Collections.emptyMap();
public NamingKernelGlobalResolver(GlobalResolver delegate, Controller controller)
Modified: projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/RuleBaseBean.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/RuleBaseBean.java 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/RuleBaseBean.java 2008-03-08 11:13:13 UTC (rev 70574)
@@ -44,6 +44,9 @@
*/
public class RuleBaseBean implements RuleBase
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -6327683478694393346L;
+
protected Logger log = Logger.getLogger(getClass());
private String name;
Modified: projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/aspects/FireAllRulesAspect.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/aspects/FireAllRulesAspect.java 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/aspects/FireAllRulesAspect.java 2008-03-08 11:13:13 UTC (rev 70574)
@@ -23,7 +23,6 @@
import java.lang.reflect.Method;
-import org.drools.Agenda;
import org.drools.WorkingMemory;
import org.drools.spi.AgendaFilter;
import org.jboss.aop.joinpoint.MethodInvocation;
@@ -84,7 +83,7 @@
{
delegate.fireAllRules();
}
- Agenda agenda = delegate.getAgenda();
+ delegate.getAgenda();
}
return result;
}
Modified: projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/security/PermissionCheck.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/security/PermissionCheck.java 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/security/PermissionCheck.java 2008-03-08 11:13:13 UTC (rev 70574)
@@ -33,6 +33,8 @@
*/
public class PermissionCheck extends Nameable
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 2080492214831785015L;
private Object action;
private boolean granted;
Modified: projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/security/RuleBasedIdentity.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/security/RuleBasedIdentity.java 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/src/main/org/jboss/reliance/drools/core/security/RuleBasedIdentity.java 2008-03-08 11:13:13 UTC (rev 70574)
@@ -82,10 +82,10 @@
{
if ((p instanceof Group) && ROLES_GROUP.equals(p.getName()))
{
- Enumeration e = ((Group)p).members();
+ Enumeration<? extends Principal> e = ((Group)p).members();
while (e.hasMoreElements())
{
- Principal role = (Principal)e.nextElement();
+ Principal role = e.nextElement();
securityContext.insert(new Role(role.getName()));
}
}
@@ -114,7 +114,7 @@
{
if (i == 0 && arg[0] instanceof Collection)
{
- for (Object value : (Collection)arg[i])
+ for (Object value : (Collection<?>)arg[i])
{
if (securityContext.getFactHandle(value) == null)
{
Modified: projects/microcontainer/trunk/reliance-rules/src/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.java
===================================================================
--- projects/microcontainer/trunk/reliance-rules/src/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.java 2008-03-08 11:09:12 UTC (rev 70573)
+++ projects/microcontainer/trunk/reliance-rules/src/tests/org/jboss/test/reliance/drools/test/ConceptTestCase.java 2008-03-08 11:13:13 UTC (rev 70574)
@@ -70,14 +70,14 @@
assertEquals(ControllerState.NOT_INSTALLED, testerContext.getState());
}
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new NonValidatingDelegate(clazz);
}
private static class NonValidatingDelegate extends MicrocontainerTestDelegate
{
- public NonValidatingDelegate(Class clazz) throws Exception
+ public NonValidatingDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
More information about the jboss-cvs-commits
mailing list