[picocontainer-scm] [picocontainer] [3145] java/nanocontainer/trunk: Fixed circular dependency between AOP and groovy modules.

Revision

3145

Author

mauro

Date

2006-12-26 04:32:38 -0600 (Tue, 26 Dec 2006)

Log Message

Fixed circular dependency between AOP and groovy modules.
Added target to svn:ignore.  Removed empty packages.

Modified Paths

• java/nanocontainer/trunk/container-groovy/pom.xml
• java/nanocontainer/trunk/pom.xml
• java/nanocontainer/trunk/webcontainer/pom.xml

Added Paths

• java/nanocontainer/trunk/container-groovy/src/java/org/nanocontainer/script/groovy/DynaopGroovyNodeBuilder.java

Removed Paths

• java/nanocontainer/trunk/container/src/java/org/nanocontainer/aop/
• java/nanocontainer/trunk/container/src/java/org/nanocontainer/script/groovy/
• java/nanocontainer/trunk/container/src/test/org/nanocontainer/aop/
• java/nanocontainer/trunk/container/src/test/org/nanocontainer/script/groovy/
• java/nanocontainer/trunk/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopGroovyNodeBuilder.java

Property Changed

• java/nanocontainer/trunk/container-aop/
• java/nanocontainer/trunk/container-bsh/
• java/nanocontainer/trunk/container-groovy/
• java/nanocontainer/trunk/container-jruby/
• java/nanocontainer/trunk/container-jython/
• java/nanocontainer/trunk/container-rhino/
• java/nanocontainer/trunk/container-tck/

Diff

Property changes: java/nanocontainer/trunk/container-aop

Name: svn:ignore
   + 
target

Deleted: java/nanocontainer/trunk/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopGroovyNodeBuilder.java (3144 => 3145)

--- java/nanocontainer/trunk/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopGroovyNodeBuilder.java	2006-12-26 10:12:19 UTC (rev 3144)
+++ java/nanocontainer/trunk/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopGroovyNodeBuilder.java	2006-12-26 10:32:38 UTC (rev 3145)
@@ -1,33 +0,0 @@
-/*****************************************************************************
- * Copyright (c) PicoContainer Organization. All rights reserved.            *
- * ------------------------------------------------------------------------- *
- * The software in this package is published under the terms of the BSD      *
- * style license a copy of which has been included with this distribution in *
- * the LICENSE.txt file.                                                     *
- *                                                                           *
- * Idea by Rachel Davies, Original code by various                           *
- *****************************************************************************/
-package org.nanocontainer.aop.dynaop;
-
-import org.nanocontainer.aop.defaults.AopNodeBuilderDecorationDelegate;
-import org.nanocontainer.aop.dynaop.DynaopAspectsManager;
-
-/**
- * A {@link org.nanocontainer.script.groovy.GroovyNodeBuilder} that supports
- * scripting of aspects via dynaop.
- *
- * @author Stephen Molitor
- * @version $Revision$
- */
-public class DynaopGroovyNodeBuilder extends GroovyNodeBuilder {
-
-    /**
-     * Creates a new <code>DynaopGroovyNodeBuilder</code> that will use
-     * the default @{link DynaopAspectsManager} to apply aspects.
-     */
-    public DynaopGroovyNodeBuilder() {
-        super(new AopNodeBuilderDecorationDelegate(new DynaopAspectsManager()), GroovyNodeBuilder.SKIP_ATTRIBUTE_VALIDATION);
-    }
-
-
-}

Property changes: java/nanocontainer/trunk/container-bsh

Name: svn:ignore
   + 
target

Property changes: java/nanocontainer/trunk/container-groovy

Name: svn:ignore
   + 
target

Modified: java/nanocontainer/trunk/container-groovy/pom.xml (3144 => 3145)

--- java/nanocontainer/trunk/container-groovy/pom.xml	2006-12-26 10:12:19 UTC (rev 3144)
+++ java/nanocontainer/trunk/container-groovy/pom.xml	2006-12-26 10:32:38 UTC (rev 3145)
@@ -19,8 +19,6 @@
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>nanocontainer-aop</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${pom.groupId}</groupId>

Copied: java/nanocontainer/trunk/container-groovy/src/java/org/nanocontainer/script/groovy/DynaopGroovyNodeBuilder.java (from rev 3144, java/nanocontainer/trunk/container-aop/src/java/org/nanocontainer/aop/dynaop/DynaopGroovyNodeBuilder.java) (0 => 3145)

--- java/nanocontainer/trunk/container-groovy/src/java/org/nanocontainer/script/groovy/DynaopGroovyNodeBuilder.java	                        (rev 0)
+++ java/nanocontainer/trunk/container-groovy/src/java/org/nanocontainer/script/groovy/DynaopGroovyNodeBuilder.java	2006-12-26 10:32:38 UTC (rev 3145)
@@ -0,0 +1,33 @@
+/*****************************************************************************
+ * Copyright (c) PicoContainer Organization. All rights reserved.            *
+ * ------------------------------------------------------------------------- *
+ * The software in this package is published under the terms of the BSD      *
+ * style license a copy of which has been included with this distribution in *
+ * the LICENSE.txt file.                                                     *
+ *                                                                           *
+ * Idea by Rachel Davies, Original code by various                           *
+ *****************************************************************************/
+package org.nanocontainer.script.groovy;
+
+import org.nanocontainer.aop.defaults.AopNodeBuilderDecorationDelegate;
+import org.nanocontainer.aop.dynaop.DynaopAspectsManager;
+
+/**
+ * A {@link org.nanocontainer.script.groovy.GroovyNodeBuilder} that supports
+ * scripting of aspects via dynaop.
+ *
+ * @author Stephen Molitor
+ * @version $Revision$
+ */
+public class DynaopGroovyNodeBuilder extends GroovyNodeBuilder {
+
+    /**
+     * Creates a new <code>DynaopGroovyNodeBuilder</code> that will use
+     * the default @{link DynaopAspectsManager} to apply aspects.
+     */
+    public DynaopGroovyNodeBuilder() {
+        super(new AopNodeBuilderDecorationDelegate(new DynaopAspectsManager()), GroovyNodeBuilder.SKIP_ATTRIBUTE_VALIDATION);
+    }
+
+
+}

Property changes: java/nanocontainer/trunk/container-jruby

Name: svn:ignore
   + 
target

Property changes: java/nanocontainer/trunk/container-jython

Name: svn:ignore
   + 
target

Property changes: java/nanocontainer/trunk/container-rhino

Name: svn:ignore
   + 
target

Property changes: java/nanocontainer/trunk/container-tck

Name: svn:ignore
   + 
target

Modified: java/nanocontainer/trunk/pom.xml (3144 => 3145)

--- java/nanocontainer/trunk/pom.xml	2006-12-26 10:12:19 UTC (rev 3144)
+++ java/nanocontainer/trunk/pom.xml	2006-12-26 10:32:38 UTC (rev 3145)
@@ -129,11 +129,26 @@
             </dependency>
             <dependency>
                 <groupId>${pom.groupId}</groupId>
+                <artifactId>nanocontainer-aop</artifactId>
+                <version>${pom.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
+                <artifactId>nanocontainer-groovy</artifactId>
+                <version>${pom.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
                 <artifactId>nanocontainer-tck</artifactId>
                 <version>${pom.version}</version>
             </dependency>
             <dependency>
                 <groupId>${pom.groupId}</groupId>
+                <artifactId>nanocontainer-test</artifactId>
+                <version>${pom.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${pom.groupId}</groupId>
                 <artifactId>nanocontainer-booter</artifactId>
                 <version>${pom.version}</version>
             </dependency>

Modified: java/nanocontainer/trunk/webcontainer/pom.xml (3144 => 3145)

--- java/nanocontainer/trunk/webcontainer/pom.xml	2006-12-26 10:12:19 UTC (rev 3144)
+++ java/nanocontainer/trunk/webcontainer/pom.xml	2006-12-26 10:32:38 UTC (rev 3145)
@@ -10,17 +10,7 @@
     </parent>
     <artifactId>nanocontainer-webcontainer</artifactId>
     <name>NanoContainer WebContainer</name>
-    <scm>
-        <connection>
-            scm:svn:https://svn.codehaus.org/picocontainer/java/nanocontainer/trunk/webcontainer
-        </connection>
-        <developerConnection>
-            scm:svn:https://svn.codehaus.org/scm/picocontainer/java/nanocontainer/trunk/webcontainer
-        </developerConnection>
-        <url>
-            https://svn.codehaus.org/picocontainer/java/nanocontainer/trunk/webcontainer
-        </url>
-    </scm>
+    <packaging>jar</packaging>
     <dependencies>
         <dependency>
             <groupId>org.picocontainer</groupId>
@@ -37,7 +27,6 @@
         <dependency>
             <groupId>org.nanocontainer</groupId>
             <artifactId>nanocontainer-groovy</artifactId>
-            <version>1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -46,6 +35,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
             <version>6.0.1</version>
@@ -58,12 +53,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>tomcat</groupId>
             <artifactId>jasper-runtime</artifactId>
             <version>5.5.15</version>

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email