You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2009/12/19 23:37:26 UTC

svn commit: r892518 - in /myfaces/extensions/scripting/trunk: ./ core/core/src/main/java/org/apache/myfaces/scripting/api/ core/core/src/main/java/org/apache/myfaces/scripting/refresh/ core/myfaces12-extensions/ core/myfaces2-extensions/ examples/ exam...

Author: werpu
Date: Sat Dec 19 22:37:25 2009
New Revision: 892518

URL: http://svn.apache.org/viewvc?rev=892518&view=rev
Log:
dependency cleanup in the poms

Modified:
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
    myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java
    myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml
    myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml
    myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
    myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
    myfaces/extensions/scripting/trunk/examples/pom.xml
    myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml
    myfaces/extensions/scripting/trunk/pom.xml

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/api/BaseWeaver.java Sat Dec 19 22:37:25 2009
@@ -10,6 +10,7 @@
 import org.apache.myfaces.scripting.core.util.ReflectUtil;
 import org.apache.myfaces.scripting.core.util.WeavingContext;
 import org.apache.myfaces.scripting.refresh.ReloadingMetadata;
+import org.apache.myfaces.scripting.refresh.RefreshContext;
 
 import javax.faces.context.FacesContext;
 import java.io.File;
@@ -51,8 +52,6 @@
     private static final String SCOPE_APPLICATION = "application";
     private static final String SCOPE_REQUEST = "request";
 
-    private static Boolean BEAN_LOCK = new Boolean(true);
-
     public BaseWeaver() {
         _reloadingStrategy = new GlobalReloadingStrategy(this);
     }
@@ -140,7 +139,7 @@
             //if not tained then we can recycle the last class loaded
             return metadata.getAClass();
         }
-        synchronized (BaseWeaver.class) {
+        synchronized (RefreshContext.RELOAD_SYNC_MONITOR) {
             //another chance just in case someone has reloaded between
             //the last if and synchronized, that way we can reduce the number of waiting threads
             if (!metadata.isTainted()) {
@@ -171,7 +170,7 @@
                  * the reload has to be performed synchronized
                  * hence there is no chance to do it unsynchronized
                  */
-                synchronized (BaseWeaver.class) {
+                synchronized (RefreshContext.RELOAD_SYNC_MONITOR) {
                     metadata = classMap.get(className);
                     if (metadata != null) {
                         return reloadScriptingClass(metadata.getAClass());
@@ -253,7 +252,7 @@
         if (WeavingContext.getRefreshContext().isRecompileRecommended(getScriptingEngine())) {
             // we set a lock over the compile and bean refresh
             //and an inner check again to avoid unneeded compile triggers
-            synchronized (BEAN_LOCK) {
+            synchronized (RefreshContext.BEAN_SYNC_MONITOR) {
                 if (WeavingContext.getRefreshContext().isRecompileRecommended(getScriptingEngine())) {
                     recompileRefresh();
                     return;
@@ -301,7 +300,7 @@
             Map<String, ManagedBean> mbeans = RuntimeConfig.getCurrentInstance(FacesContext.getCurrentInstance().getExternalContext()).getManagedBeans();
             Map<String, ManagedBean> workCopy = null;
 
-            synchronized (BEAN_LOCK) {
+            synchronized (RefreshContext.BEAN_SYNC_MONITOR) {
                 workCopy = makeSnapshot(mbeans);
             }
 
@@ -387,7 +386,7 @@
         //But for most cases this mutex should be enough
 
         Map<String, ManagedBean> workCopy = null;
-        synchronized (BEAN_LOCK) {
+        synchronized (RefreshContext.BEAN_SYNC_MONITOR) {
             workCopy = makeSnapshot(mbeans);
         }
 
@@ -402,7 +401,7 @@
                         //request, nothing has to be done here
                         return;
                     }
-                    synchronized (BEAN_LOCK) {
+                    synchronized (RefreshContext.BEAN_SYNC_MONITOR) {
                         if (scope.equalsIgnoreCase(SCOPE_SESSION)) {
                             FacesContext.getCurrentInstance().getExternalContext().getSessionMap().remove(entry.getValue().getManagedBeanName());
                         } else {
@@ -426,7 +425,9 @@
      * @param bean
      */
     private void removeBeanReferences(ManagedBean bean) {
-        getLog().info("[EXT-SCRIPTING] JavaScriptingWeaver.removeBeanReferences(" + bean.getManagedBeanName() + ")");
+        if(getLog().isInfoEnabled()) {
+            getLog().info("[EXT-SCRIPTING] JavaScriptingWeaver.removeBeanReferences(" + bean.getManagedBeanName() + ")");
+        }
 
         String scope = bean.getManagedBeanScope();
 

Modified: myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java (original)
+++ myfaces/extensions/scripting/trunk/core/core/src/main/java/org/apache/myfaces/scripting/refresh/RefreshContext.java Sat Dec 19 22:37:25 2009
@@ -50,6 +50,8 @@
      * tainted == false!
      */
     FileChangedDaemon daemon = FileChangedDaemon.getInstance();
+    public static Boolean BEAN_SYNC_MONITOR = new Boolean(true);
+    public static Boolean RELOAD_SYNC_MONITOR = new Boolean(true);
 
     public long getPersonalScopedBeanRefresh() {
         return personalScopedBeanRefresh;

Modified: myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces12-extensions/pom.xml Sat Dec 19 22:37:25 2009
@@ -48,6 +48,13 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.8.0</version>
         </dependency>
+
+         <dependency>
+            <groupId>commons-el</groupId>
+            <artifactId>commons-el</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

Modified: myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/core/myfaces2-extensions/pom.xml Sat Dec 19 22:37:25 2009
@@ -46,7 +46,7 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.8.0</version>
         </dependency>
-
+  
        
     </dependencies>
 

Modified: myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces12-example/pom.xml Sat Dec 19 22:37:25 2009
@@ -16,28 +16,7 @@
 
     
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.1</version>
-                <configuration>
-                    <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>9090</port>
-                            <maxIdleTime>60000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <scanIntervalSeconds>1</scanIntervalSeconds>
-                    
-                </configuration>
-
-            </plugin>
-
-        </plugins>
-    </build>
-
+    
     <dependencies>
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
@@ -93,6 +72,7 @@
             <version>1.2</version>
             <scope>runtime</scope>
         </dependency>
+        
 
         <dependency>
             <groupId>org.apache.myfaces.tomahawk</groupId>
@@ -106,11 +86,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.0</version>
-            <scope>test</scope>
-        </dependency>
+        
     </dependencies>
 </project>

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/pom.xml Sat Dec 19 22:37:25 2009
@@ -33,22 +33,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.1</version>
-                <configuration>
-                    <connectors>
-                        <connector implementation = "org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>9090</port>
-                            <maxIdleTime>60000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <scanIntervalSeconds>1</scanIntervalSeconds>
-
-                </configuration>
-
-            </plugin>
 
         </plugins>
     </build>
@@ -96,11 +80,5 @@
             <version>1.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer1.java Sat Dec 19 22:37:25 2009
@@ -42,7 +42,8 @@
  * the annotation is dynamic you can change it on the fly or move it from one
  * class to the other
  */
-@FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer") 
+ @FacesRenderer(componentFamily = "javax.faces.Input", rendererType = "at.irian.JavaTestRenderer")
+ 
   public class JavaTestRenderer1 extends HtmlTextRendererBase {
 
     static Log log = LogFactory.getLog(JavaTestRenderer1.class);

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/renderer/JavaTestRenderer2.java Sat Dec 19 22:37:25 2009
@@ -36,13 +36,16 @@
 
  public class JavaTestRenderer2 extends HtmlTextareaRendererBase {
 
-    private static final String MSG = "Hello world from Renderer 2  ";
+    private static final String MSG = "aaa Hello world from Renderer 2  ";
+
+    private static final String MSG2 =" hello world second var";
 
     @Override
     public void encodeBegin(FacesContext context, UIComponent component) throws IOException {
         super.encodeBegin(context, component);
         ResponseWriter writer = context.getResponseWriter();
         writer.write(MSG);
+        writer.write(MSG2);
         writer.write((String)ReflectUtil.executeMethod(component, "getMarker"));
     }
 

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean2.java Sat Dec 19 22:37:25 2009
@@ -17,12 +17,12 @@
 public class TestBean2 {
 
 
-    String sayHello = "hello worldgggg";
+    String sayHello = "hello world test";
     String hello2 = "hello from added attribute";
     String hello3 = "hello from  added attribute 2";
  
     public String getSayHello() {
-        return "Testbean2 Java dynamic  bean - "+TestClass2.hello2 + hello3;
+        return sayHello;
     }
 
     public String getSayHello2() {

Modified: myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java (original)
+++ myfaces/extensions/scripting/trunk/examples/myfaces20-example/src/main/webapp/WEB-INF/java/org/apache/myfaces/javaloader/test/TestBean3.java Sat Dec 19 22:37:25 2009
@@ -24,12 +24,13 @@
     String hello3 = "hello from  added attribute 2";
 
 
-    private String myNewString() {
-        return "hello world";
+
+    private String myText() {
+        return "hello world from bean3 from the new method";
     }
 
     public String getSayHello() {
-        return myNewString();
+        return myText();
     }
 
     public String getSayHello2() {

Modified: myfaces/extensions/scripting/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/pom.xml?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/pom.xml Sat Dec 19 22:37:25 2009
@@ -1,6 +1,6 @@
-<project xmlns = "http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>examples</artifactId>
     <packaging>pom</packaging>
@@ -17,6 +17,24 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.1</version>
+                <configuration>
+                    <connectors>
+                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>9090</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                    <scanIntervalSeconds>1</scanIntervalSeconds>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <modules>
         <module>myfaces12-example</module>
         <module>myfaces20-example</module>

Modified: myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/examples/spring-example/pom.xml Sat Dec 19 22:37:25 2009
@@ -12,27 +12,7 @@
     <name>A custom project using myfaces and spring</name>
     <version>1.0-SNAPSHOT</version>
     <url>http://www.apache.org</url>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.1</version>
-                <configuration>
-                    <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>9090</port>
-                            <maxIdleTime>60000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <scanIntervalSeconds>1</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
+   
 
     <dependencies>
         <dependency>
@@ -102,12 +82,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.0</version>
-            <scope>test</scope>
-        </dependency>
+        
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring</artifactId>

Modified: myfaces/extensions/scripting/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/scripting/trunk/pom.xml?rev=892518&r1=892517&r2=892518&view=diff
==============================================================================
--- myfaces/extensions/scripting/trunk/pom.xml (original)
+++ myfaces/extensions/scripting/trunk/pom.xml Sat Dec 19 22:37:25 2009
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns = "http://maven.apache.org/POM/4.0.0" xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.myfaces.extension-scripting</groupId>
     <artifactId>root</artifactId>
@@ -28,7 +28,7 @@
             <releases>
                 <enabled>false</enabled>
             </releases>
-            <snapshots />
+            <snapshots/>
             <id>apache-maven-snapshots</id>
             <url>http://people.apache.org/repo/m2-snapshot-repository</url>
         </repository>
@@ -69,35 +69,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>commons-validator</groupId>
-            <artifactId>commons-validator</artifactId>
-            <version>1.2.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>1.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <!-- provided dependencies -->
 
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -105,13 +76,12 @@
             <version>2.3</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
-            <groupId>org.apache.myfaces.tomahawk</groupId>
-            <artifactId>tomahawk</artifactId>
-            <version>1.1.6</version>
-            <scope>provided</scope>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.4</version>
         </dependency>
-
         <!-- test dependencies -->
 
         <dependency>
@@ -121,42 +91,6 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.struts.shale</groupId>
-            <artifactId>shale-test</artifactId>
-            <version>1.0.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.myfaces.tomahawk</groupId>
-            <artifactId>tomahawk</artifactId>
-            <version>1.1.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <version>1.5.6</version>
-        </dependency>
-        <dependency>
-            <groupId>velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.5</version>
-        </dependency>
-
-
-
-        <!--
-         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-jci-jsr199</artifactId>
-            <version>1.0</version>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-jci-javac</artifactId>
-            <version>1.0</version>
-        </dependency>
 
     </dependencies>