continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r393825 - in /maven/continuum/branches/continuum-1.0.x/continuum-web/src/main: java/org/apache/maven/continuum/web/tool/ resources/META-INF/plexus/
Date Thu, 13 Apr 2006 15:10:14 GMT
Author: evenisse
Date: Thu Apr 13 08:10:12 2006
New Revision: 393825

URL: http://svn.apache.org/viewcvs?rev=393825&view=rev
Log:
Remove role-hint on continuum state generator component. Without it, we keep only one object
in memory (don't understand why)

Modified:
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java
    maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java?rev=393825&r1=393824&r2=393825&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumStateContentGenerator.java
Thu Apr 13 08:10:12 2006
@@ -46,6 +46,7 @@
         else
         {
             BuildResult buildResult = (BuildResult) item;
+
             state = buildResult.getState();
         }
 

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java?rev=393825&r1=393824&r2=393825&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/ContinuumTriggerContentGenerator.java
Thu Apr 13 08:10:12 2006
@@ -29,12 +29,12 @@
     extends AbstractLogEnabled
     implements ContentGenerator
 {
-
     public String generate( Object item )
     {
         int trigger;
 
         BuildResult result = (BuildResult) item;
+
         trigger = result.getTrigger();
 
         if ( trigger == ContinuumProjectState.TRIGGER_SCHEDULED )

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java?rev=393825&r1=393824&r2=393825&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/WorkingCopyContentGenerator.java
Thu Apr 13 08:10:12 2006
@@ -33,7 +33,7 @@
     extends AbstractLogEnabled
     implements RequestTool
 {
-    private RunData data;
+    private String contextPath;
 
     private File basedir;
 
@@ -119,7 +119,7 @@
 
     private String getBrowseServletPath()
     {
-        return data.getContextPath() + "/servlet/browse?file=";
+        return contextPath + "/servlet/browse?file=";
     }
 
     private String getFileUrl( String directory, String fileName )
@@ -140,7 +140,7 @@
 
     public void setRunData( RunData data )
     {
-        this.data = data;
+        contextPath = data.getContextPath();
     }
 
     public void refresh()

Modified: maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=393825&r1=393824&r2=393825&view=diff
==============================================================================
--- maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/branches/continuum-1.0.x/continuum-web/src/main/resources/META-INF/plexus/components.xml
Thu Apr 13 08:10:12 2006
@@ -113,14 +113,12 @@
           </tool>
           <tool>
             <name>state</name>
-            <role>org.codehaus.plexus.formica.web.ContentGenerator</role>
-            <role-hint>continuum-state</role-hint>
+            <role>continuum-state</role>
             <scope>request</scope>
           </tool>
           <tool>
             <name>trigger</name>
-            <role>org.codehaus.plexus.formica.web.ContentGenerator</role>
-            <role-hint>continuum-trigger</role-hint>
+            <role>continuum-trigger</role>
             <scope>global</scope>
           </tool>
           <tool>
@@ -671,14 +669,12 @@
      |-->
 
     <component>
-      <role>org.codehaus.plexus.formica.web.ContentGenerator</role>
-      <role-hint>continuum-state</role-hint>
+      <role>continuum-state</role>
       <implementation>org.apache.maven.continuum.web.tool.ContinuumStateContentGenerator</implementation>
     </component>
 
     <component>
-      <role>org.codehaus.plexus.formica.web.ContentGenerator</role>
-      <role-hint>continuum-trigger</role-hint>
+      <role>continuum-trigger</role>
       <implementation>org.apache.maven.continuum.web.tool.ContinuumTriggerContentGenerator</implementation>
     </component>
 



Mime
View raw message