[procilege commit] r89 - in trunk/procilege: . src/main/java/merisis src/main/java/procilege/impl src/test/java/meri...

[codesite...@google.com]

Author: lcgong
Date: Sat Jun 16 10:40:20 2007
New Revision: 89

Removed:
trunk/procilege/src/main/java/merisis/
trunk/procilege/src/test/java/merisis/
Modified:
trunk/procilege/pom.xml
trunk/procilege/src/main/java/procilege/impl/DefaultProcilegeModule.java
trunk/procilege/src/test/java/procilege/test/pal/AbstractPalTest.java
trunk/procilege/src/test/java/procilege/test/pal/ParsingTest.java

Log:
[Issue 38] Moved the code of merisis into procilege.

Modified: trunk/procilege/pom.xml
==============================================================================
--- trunk/procilege/pom.xml (original)
+++ trunk/procilege/pom.xml Sat Jun 16 10:40:20 2007
@@ -12,6 +12,13 @@

<dependencies>
<dependency>
+ <groupId>merisis</groupId>
+ <artifactId>merisis</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.google.code.guice</groupId>
<artifactId>guice</artifactId>
<version>1.0</version>

Modified: trunk/procilege/src/main/java/procilege/impl/DefaultProcilegeModule.java
==============================================================================
--- trunk/procilege/src/main/java/procilege/impl/DefaultProcilegeModule.java (original)
+++ trunk/procilege/src/main/java/procilege/impl/DefaultProcilegeModule.java Sat Jun 16 10:40:20 2007
@@ -1,13 +1,5 @@
package procilege.impl;

-import merisis.MerisisVM;
-import merisis.contentcloud.ContentCloud;
-import merisis.contentcloud.impl.ContentCloudImpl;
-import merisis.sense.SenseMaker;
-import merisis.sense.impl.SenseMakerImpl;
-import merisis.traitspace.History;
-import merisis.traitspace.impl.MemoryHistoryImpl;
-import merisis.traitspace.impl.TraitSpaceImpl;
import procilege.Procilege;
import procilege.compute.ExprEvaluation;
import procilege.compute.ExprExpand;
@@ -25,15 +17,6 @@
public void configure() {

bind(Procilege.class).to(ProcilegeImpl.class) //
- .in(Scopes.SINGLETON);
-
- bind(History.class).to(MemoryHistoryImpl.class) //
- .in(Scopes.SINGLETON);
- bind(ContentCloud.class).to(ContentCloudImpl.class) //
- .in(Scopes.SINGLETON);
- bind(MerisisVM.class).to(TraitSpaceImpl.class) //
- .in(Scopes.SINGLETON);
- bind(SenseMaker.class).to(SenseMakerImpl.class) //
.in(Scopes.SINGLETON);

bind(PrivilegeFormAnalysis.class).to(PrivFormAnalysisImpl.class) //

Modified: trunk/procilege/src/test/java/procilege/test/pal/AbstractPalTest.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/pal/AbstractPalTest.java (original)
+++ trunk/procilege/src/test/java/procilege/test/pal/AbstractPalTest.java Sat Jun 16 10:40:20 2007
@@ -7,6 +7,7 @@
import javax.xml.namespace.QName;

import merisis.MerisisVM;
+import merisis.impl.DefaultMerisisModule;
import merisis.sense.SenseMaker;
import merisis.traitspace.History;
import merisis.util.BitUtil;
@@ -94,7 +95,7 @@
if (qn == null)
continue;
sb.append(String.format("%02d(%10s): ", i, qn.getLocalPart()));
-
+
OpenBitSet bs = new OpenBitSet();
long[] list = ht.next(i);
if (list == null) {
@@ -110,8 +111,8 @@

@Before
public void initProcilege() {
- Injector guice = Guice.createInjector(new DefaultProcilegeModule(),
- TestZero.module());
+ Injector guice = Guice.createInjector(new DefaultMerisisModule(),
+ new DefaultProcilegeModule(), TestZero.module());

guice.injectMembers(this);

@@ -121,10 +122,10 @@

@After
public void aftercase() {
- try {
+ try {
mvm.stepout();
} catch (Exception e) {
- logger.log(Level.WARNING, e.getMessage(),e);
+ logger.log(Level.WARNING, e.getMessage(), e);
}
}

Modified: trunk/procilege/src/test/java/procilege/test/pal/ParsingTest.java
==============================================================================
--- trunk/procilege/src/test/java/procilege/test/pal/ParsingTest.java (original)
+++ trunk/procilege/src/test/java/procilege/test/pal/ParsingTest.java Sat Jun 16 10:40:20 2007
@@ -10,37 +10,27 @@
import com.google.inject.Inject;
import com.google.inject.Injector;

-public class ParsingTest {
+public class ParsingTest extends AbstractPalTest {

@Test
- public void simple() {
+ public void simple() {

- z.tell("p1 := z + a*b/(x||y)*c");
+ tell("p1 := z + a*b/(x||y)*c");
z.print(z.ln("p1"));

- z.tell("p2 := (a+b)/x*c[a==z]");
+ tell("p2 := (a+b)/x*c[a==z]");
z.print(z.ln("p2"));

- z.tell("p3:=a{(a+b)/a}");
+ tell("p3:=a{(a+b)/a}");
z.print(z.ln("p3"));

- z.tell("p4:=a[x*~y]");
+ tell("p4:=a[x*~y]");
z.print(z.ln("p4"));

- z.tell("p5:=a[s*~(m+n)]");
+ tell("p5:=a[s*~(m+n)]");
z.print(z.ln("p5"));

- z.tell("p6:=a[(x||y)&&(y*~z)]");
+ tell("p6:=a[(x||y)&&(y*~z)]");
z.print(z.ln("p6"));
- }
-
- @Inject
- private TestZero z;
-
- @Before
- public void initProcilege() {
- Injector guice = Guice.createInjector(new DefaultProcilegeModule(), TestZero.module());
-
- guice.injectMembers(this);
}
}