You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/19 11:52:01 UTC
svn commit: r1302370 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js: pom.xml
src/main/webapp/js/archiva/main.js src/main/webapp/js/archiva/search.js
src/main/webapp/js/archiva/startup.js
src/main/webapp/js/archiva/templates/search.html
Author: olamy
Date: Mon Mar 19 10:52:00 2012
New Revision: 1302370
URL: http://svn.apache.org/viewvc?rev=1302370&view=rev
Log:
missed some pom change for previous unit test added
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1302370&r1=1302369&r2=1302370&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Mon Mar 19 10:52:00 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1302370&r1=1302369&r2=1302370&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Mon Mar 19 10:52:00 2012
@@ -129,7 +129,6 @@ $(function() {
return;
}
}
-
// by default display search screen
displaySearch();
}
@@ -289,7 +288,6 @@ $(function() {
.appendTo( ul );
};;
}
-
startArchivaApplication();
})
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1302370&r1=1302369&r2=1302370&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Mon Mar 19 10:52:00 2012
@@ -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
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js?rev=1302370&r1=1302369&r2=1302370&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js Mon Mar 19 10:52:00 2012
@@ -53,6 +53,7 @@ $(function() {
});
loadJs=function(){
+
$.ajax(
{
url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1302370&r1=1302369&r2=1302370&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Mon Mar 19 10:52:00 2012
@@ -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>