missed some pom change for previous unit test added

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1302370 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 940003639a4751789d49a7015aa5993405201fc9..b8469f74d815855155374683bbb36c96ac74ed6f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -38,6 +38,10 @@
     <archiva.javascriptLog>true</archiva.javascriptLog>
     <archiva.logMissingI18n>true</archiva.logMissingI18n>
     <archivaAppServerBase>${project.build.directory}/appserver-base</archivaAppServerBase>
+    <jettyVersion>7.5.3.v20111011</jettyVersion>
+    <archiva.baseRestUrl />
+    <rest.admin.pwd />
+    <test.useTomcat>false</test.useTomcat>
   </properties>
 
   <dependencies>
@@ -372,6 +376,7 @@
         </exclusion>
       </exclusions>
     </dependency>
+
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-rest-api</artifactId>
@@ -576,6 +581,26 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.codehaus.redback</groupId>
+      <artifactId>redback-rest-services</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jettyVersion}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-plus</artifactId>
+      <version>${jettyVersion}</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -753,6 +778,25 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+            <plexus.home>${project.build.directory}/appserver-base</plexus.home>
+            <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
+            <archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
+            <rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
+            <test.useTomcat>${test.useTomcat}</test.useTomcat>
+            <redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
+            <redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
+            <expectedVersion>${project.version}</expectedVersion>
+            <archiva.logMissingI18n>true</archiva.logMissingI18n>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index 382716dcdfda0bd66dd7f115867506bcba7a37f6..59209c3f96924a7166b79f4eb4b705676dfd6e9f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -129,7 +129,6 @@ $(function() {
         return;
       }
     }
-
     // by default display search screen
     displaySearch();
   }
@@ -289,7 +288,6 @@ $(function() {
                                                                .appendTo( ul );
                                                };;
   }
-
   startArchivaApplication();
 
 })

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index a0606ba00f469ca185a98a69558c2b6bdf5173a4..eeeab61332e51da70b2e4667b9d69bc8d4aad01d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -134,9 +134,12 @@ $(function() {
       } else {
         $("#main-content #artifact-info" ).show();
       }
+    }
 
-
+    displayArtifactVersionDetail=function(version){
+      $.log("displayArtifactVersionDetail:"+groupId+":"+artifactId+":"+version);
     }
+
   }
 
   displayArtifactDetail=function(groupId,artifactId,parentBrowseViewModel,restUrl){
@@ -932,4 +935,6 @@ $(function() {
 
   }
 
+
+
 });
\ No newline at end of file

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
index ef6283b19a396645906da45b855e3d90f15780fb..b03e70c6340fb652fcd19e4bbd743600bd710d1d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
@@ -53,6 +53,7 @@ $(function() {
   });
 
   loadJs=function(){
+
     $.ajax(
       {
         url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
index d6cab20152e8001b36bab04865f9bbdf8b712e3c..0907916358705b83b0ca6cc09c8d2de1ce5d800a 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
@@ -155,7 +155,9 @@
       <div class="alert alert-success">
         <table class="table table-condensed">
         {{each(i,version) versions}}
-          <tr><th>${version}</th></tr>
+          <tr>
+            <th><a href="#" data-bind="click: function(){displayArtifactVersionDetail(version)}">${version}</a></th>
+          </tr>
         {{/each}}
         </table>
       </div>