Author: skygo
Date: Tue May 7 21:42:38 2013
New Revision: 1480100
URL: http://svn.apache.org/r1480100
Log:
clean maven2repository module to focus only on layout in webapp
make some order hypothesis
Added:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/10maven2/
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/10maven2/main.js
(with props)
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/20legacy/
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/20legacy/main.js
(with props)
Removed:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/legacy/
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/
archiva/branches/archiva-MRM-1756/archiva-modules/plugins/maven2-repository/src/main/resources/META-INF/resources/
Modified:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PluginsService.java
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js
Modified:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PluginsService.java
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PluginsService.java?rev=1480100&r1=1480099&r2=1480100&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PluginsService.java
(original)
+++
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/services/PluginsService.java
Tue May 7 21:42:38 2013
@@ -35,11 +35,13 @@ import javax.ws.rs.core.MediaType;
public interface PluginsService
{
- @Path( "getAdminPlugins" )
+ @Path( "getAdminPlugins" )
@GET
- @Produces( { MediaType.TEXT_PLAIN } )
+ @Produces(
+ {
+ MediaType.TEXT_PLAIN
+ } )
@RedbackAuthorization( noRestriction = true )
- String getAdminPlugins( )
- throws ArchivaRestServiceException;
-
+ String getAdminPlugins()
+ throws ArchivaRestServiceException;
}
Added:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/10maven2/main.js
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/10maven2/main.js?rev=1480100&view=auto
==============================================================================
---
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/10maven2/main.js
(added)
+++
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/10maven2/main.js
Tue May 7 21:42:38 2013
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+define("archiva/admin/repository/10maven2/main",["jquery",'i18n'],
+ function() {
+ showMenu = function(administrationMenuItems) {
+ administrationMenuItems.push(
+ {text: $.i18n.prop('menu.repository.groups'),
+ id: "menu-repository-groups-list-a",
+ href: "#repositorygroup",
+ redback: "{permissions:
['archiva-manage-configuration']}",
+ func: function() {
+ displayRepositoryGroups();
+ }
+ });
+ administrationMenuItems.push({text:
$.i18n.prop('menu.repositories'), id: "menu-repositories-list-a", href:
"#repositorylist", redback: "{permissions: ['archiva-manage-configuration']}",
func: function() {
+ displayRepositoriesGrid();
+ }});
+ administrationMenuItems.push({text:
$.i18n.prop('menu.proxy-connectors'), id: "menu-proxy-connectors-list-a", href:
"#proxyconnectors", redback: "{permissions: ['archiva-manage-configuration']}",
func: function() {
+ displayProxyConnectors();
+ }});
+ administrationMenuItems.push({text:
$.i18n.prop('menu.proxy-connectors-rules'), id:
"menu.proxy-connectors-rules-list-a", href: "#proxyconnectorsrules", redback:
"{permissions: ['archiva-manage-configuration']}", func: function() {
+ displayProxyConnectorsRules();
+ }});
+
+ };
+ }
+
+);
\ No newline at end of file
Propchange:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/10maven2/main.js
------------------------------------------------------------------------------
svn:eol-style = native
Added:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/20legacy/main.js
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/20legacy/main.js?rev=1480100&view=auto
==============================================================================
---
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/20legacy/main.js
(added)
+++
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/20legacy/main.js
Tue May 7 21:42:38 2013
@@ -0,0 +1,317 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+define("archiva/admin/repository/20legacy/main", ["jquery", 'i18n','knockout'],
+ function(jquery,i18n,ko) {
+
+ showMenu = function(administrationMenuItems) {
+ administrationMenuItems.push(
+ {
+ text: $.i18n.prop('menu.legacy-artifact-support'),
+ id: "menu-legacy-support-list-a",
+ href: "#legacy",
+ redback: "{permissions:
['archiva-manage-configuration']}",
+ func: function() {
+ displayLegacyArtifactPathSupport();
+ }
+ });
+ };
+
+
+ //-------------------------
+ // legacy path part
+ //-------------------------
+
+ LegacyArtifactPath = function(path, groupId, artifactId, version,
classifier, type, update) {
+ //private String path;
+ this.path = ko.observable(path);
+
+ /**
+ * The artifact reference, as " [groupId] :
+ * [artifactId] : [version] : [classifier] : [type] ".
+ */
+ //private String artifact;
+ //this.artifact=ko.observable(artifact);
+ this.update = update;
+ //private String groupId;
+ this.groupId = ko.observable(groupId);
+
+ //private String artifactId;
+ this.artifactId = ko.observable(artifactId);
+
+ //private String version;
+ this.version = ko.observable(version);
+
+ //private String classifier;
+ this.classifier = ko.observable(classifier);
+
+ //private String type;
+ this.type = ko.observable(type);
+
+ this.modified = ko.observable();
+
+ this.artifact = ko.computed(function() {
+ var artifactValue = "";
+ if (this.groupId()) {
+ artifactValue += this.groupId();
+ }
+ if (this.artifactId()) {
+ artifactValue += ":" + this.artifactId();
+ }
+ if (this.version()) {
+ artifactValue += ":" + this.version();
+ }
+ if (this.classifier()) {
+ artifactValue += ":" + this.classifier();
+ }
+ if (this.type()) {
+ artifactValue += ":" + this.type();
+ }
+ return artifactValue;
+ }, this);
+ };
+
+ mapLegacyArtifactPaths = function(data) {
+ if (data) {
+ return $.isArray(data) ? $.map(data, function(item) {
+ return mapLegacyArtifactPath(item);
+ }) : [mapLegacyArtifactPath(data)];
+ }
+ return [];
+ };
+
+ mapLegacyArtifactPath = function(data) {
+ return data ? new LegacyArtifactPath(data.path, data.groupId,
data.artifactId, data.version, data.classifier, data.type) : null;
+ };
+
+ activateLegacyArtifactPathFormValidation = function() {
+ var theForm =
$("#main-content").find("#legacy-artifact-paths-edit-form");
+ var validator = theForm.validate({
+ showErrors: function(validator, errorMap, errorList) {
+ customShowError("#main-content
#legacy-artifact-paths-edit-form", validator, errorMap, errorMap);
+ }
+ });
+ };
+
+ LegacyArtifactPathViewModel = function(legacyArtifactPath, update,
legacyArtifactPathsViewModel) {
+ var self = this;
+ this.update = update;
+ this.legacyArtifactPath = legacyArtifactPath;
+ this.legacyArtifactPathsViewModel =
legacyArtifactPathsViewModel;
+
+ this.display = function() {
+ var mainContent = $("#main-content");
+ ko.applyBindings(self,
mainContent.find("#legacy-artifact-paths-edit").get(0));
+ mainContent.find("#legacy-artifact-paths-view-tabs-li-edit
a").html($.i18n.prop("edit"));
+ activateLegacyArtifactPathFormValidation();
+ activateLegacyArtifactPathsEditTab();
+ };
+
+ displayGrid = function() {
+ activateLegacyArtifactPathsGridTab();
+ };
+
+ calculatePath = function() {
+ var path = "";
+ if (self.legacyArtifactPath.groupId()) {
+ path += self.legacyArtifactPath.groupId() + "/jars/";
+ }
+ if (self.legacyArtifactPath.artifactId()) {
+ path += self.legacyArtifactPath.artifactId();
+ }
+ if (self.legacyArtifactPath.version()) {
+ path += "-" + self.legacyArtifactPath.version();
+ }
+ if (self.legacyArtifactPath.classifier()) {
+ path += "-" + self.legacyArtifactPath.classifier();
+ }
+ if (self.legacyArtifactPath.type()) {
+ path += "." + self.legacyArtifactPath.type();
+ }
+ self.legacyArtifactPath.path(path);
+ };
+
+ this.save = function() {
+ var theForm =
$("#main-content").find("#legacy-artifact-paths-edit-form");
+ if (!theForm.valid()) {
+ return;
+ }
+ // do that on server side
+ /*if (theForm.find("#artifact" ).val()
+ !=theForm.find("#path" ).val()){
+ var errorList=[{
+ message: $.i18n.prop("path must match artifact"),
+ element: theForm.find("#path" ).get(0)
+ }];
+ customShowError("#main-content
#legacy-artifact-paths-edit-form", null, null, errorList);
+ return;
+ }*/
+ // TODO call id exists if add ?
+ clearUserMessages();
+ $.log("save ok");
+ if (self.update) {
+ $.log("update");
+ } else {
+
$.ajax("restServices/archivaServices/archivaAdministrationService/addLegacyArtifactPath",
+ {
+ type: "POST",
+ contentType: 'application/json',
+ data: ko.toJSON(self.legacyArtifactPath),
+ dataType: 'json',
+ success: function(data) {
+
self.legacyArtifactPath.modified(false);
+
self.legacyArtifactPathsViewModel.legacyArtifactPaths.push(self.legacyArtifactPath);
+
displaySuccessMessage($.i18n.prop('legacy-artifact-path.added',
self.legacyArtifactPath.path()));
+ activateLegacyArtifactPathsGridTab();
+ },
+ error: function(data) {
+ var res =
$.parseJSON(data.responseText);
+ displayRestError(res);
+ }
+ }
+ );
+ }
+ };
+ };
+
+ LegacyArtifactPathsViewModel = function() {
+ var self = this;
+ this.legacyArtifactPaths = ko.observableArray([]);
+
+ this.gridViewModel = new ko.simpleGrid.viewModel({
+ data: self.legacyArtifactPaths,
+ columns: [
+ {
+ headerText:
$.i18n.prop('legacy-artifact-paths.path'),
+ rowText: "path"
+ },
+ {
+ headerText:
$.i18n.prop('legacy-artifact-paths.artifact'),
+ rowText: "artifact"
+ }
+ ],
+ pageSize: 5,
+ gridUpdateCallBack: function(networkProxy) {
+
$("#main-content").find("#legacy-artifact-paths-table").find("[title]").tooltip();
+ }
+ });
+
+
+ editLegacyArtifactPath = function(legacyArtifactPath) {
+ var legacyArtifactPathViewModel = new
LegacyArtifactPathViewModel(legacyArtifactPath, true);
+ legacyArtifactPathViewModel.display();
+ };
+
+ removeLegacyArtifactPath = function(legacyArtifactPath) {
+
+ openDialogConfirm(
+ function() {
+
+
$.ajax("restServices/archivaServices/archivaAdministrationService/deleteLegacyArtifactPath?path="
+ encodeURIComponent(legacyArtifactPath.path()),
+ {
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+
self.legacyArtifactPaths.remove(legacyArtifactPath);
+
displaySuccessMessage($.i18n.prop('legacy-artifact-path.removed',
legacyArtifactPath.path()));
+
activateLegacyArtifactPathsGridTab();
+ },
+ error: function(data) {
+ var res =
$.parseJSON(data.responseText);
+ displayRestError(res);
+ },
+ complete: function() {
+ closeDialogConfirm();
+ }
+ }
+ );
+ }, $.i18n.prop('ok'), $.i18n.prop('cancel'),
$.i18n.prop('legacy-artifact-path.delete.confirm', legacyArtifactPath.path()),
+
$("#legacy-artifact-path-delete-warning-tmpl").tmpl(legacyArtifactPath));
+
+ };
+
+ updateLegacyArtifactPath = function(legacyArtifactPath) {
+
+ };
+
+ };
+
+ displayLegacyArtifactPathSupport = function() {
+ screenChange();
+ var mainContent = $("#main-content");
+ mainContent.html(mediumSpinnerImg());
+
+
$.ajax("restServices/archivaServices/archivaAdministrationService/getLegacyArtifactPaths",
{
+ type: "GET",
+ dataType: 'json',
+ success: function(data) {
+
mainContent.html($("#legacy-artifact-path-main").tmpl());
+ var legacyArtifactPathsViewModel = new
LegacyArtifactPathsViewModel();
+ var legacyPaths = mapLegacyArtifactPaths(data);
+ $.log("legacyPaths:" + legacyPaths.length);
+
legacyArtifactPathsViewModel.legacyArtifactPaths(legacyPaths);
+ ko.applyBindings(legacyArtifactPathsViewModel,
mainContent.find("#legacy-artifact-paths-view").get(0));
+
+
mainContent.find("#legacy-artifact-paths-view-tabs").on('show', function(e) {
+ if ($(e.target).attr("href") ==
"#legacy-artifact-paths-edit") {
+ var viewModel = new
LegacyArtifactPathViewModel(new LegacyArtifactPath(), false,
legacyArtifactPathsViewModel);
+ viewModel.display();
+ activateLegacyArtifactPathFormValidation();
+ clearUserMessages();
+ }
+ if ($(e.target).attr("href") ==
"#legacy-artifact-paths-view") {
+
mainContent.find("#legacy-artifact-paths-view-tabs-li-edit
a").html($.i18n.prop("add"));
+ clearUserMessages();
+ }
+
+ });
+
+
+ activateLegacyArtifactPathsGridTab();
+ }
+ });
+
+
+ };
+
+
+ activateLegacyArtifactPathsGridTab = function() {
+ var mainContent = $("#main-content");
+
mainContent.find("#legacy-artifact-paths-view-tabs-li-edit").removeClass("active");
+
mainContent.find("#legacy-artifact-paths-edit").removeClass("active");
+
+
mainContent.find("#legacy-artifact-paths-view-tabs-li-grid").addClass("active");
+
mainContent.find("#legacy-artifact-paths-view").addClass("active");
+ mainContent.find("#legacy-artifact-paths-view-tabs-li-edit
a").html($.i18n.prop("add"));
+
+ };
+
+ activateLegacyArtifactPathsEditTab = function() {
+ var mainContent = $("#main-content");
+
mainContent.find("#legacy-artifact-paths-view-tabs-li-grid").removeClass("active");
+
mainContent.find("#legacy-artifact-paths-view").removeClass("active");
+
+
mainContent.find("#legacy-artifact-paths-view-tabs-li-edit").addClass("active");
+
mainContent.find("#legacy-artifact-paths-edit").addClass("active");
+ };
+
+
+
+
+ }
+);
Propchange:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/20legacy/main.js
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js?rev=1480100&r1=1480099&r2=1480100&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
Tue May 7 21:42:38 2013
@@ -232,11 +232,11 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
dataType: 'text',
success: function(data) {
$.each(data.split("|"), function(key, value) {
- require([value], function() {
- showMenu(self.administrationMenuItems);
- });
-
- });
+ require([value], function() {
+ showMenu(self.administrationMenuItems);
+ });
+
+ });
}
});
//var myrepplugins =
"archiva/admin/repository/legacy/main|archiva/admin/repository/maven2/main";
@@ -777,7 +777,7 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
$("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo:
window.archivaRuntimeInfo}));
drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome");
});
- }
+ };
userLoggedCallbackFn=function(user){
$.log("userLoggedCallbackFn:"+ (user?user.username():null));
@@ -901,18 +901,18 @@ function(jquery,ui,sammy,tmpl,i18n,jquer
}
);
},
- select: function( event, ui ) {
- $.log("select artifactId:"+ui.item.artifactId);
-
window.sammyArchivaApplication.setLocation("#quicksearch~"+ui.item.artifactId);
- }
- }).data( "autocomplete" )._renderItem = function( ul, item ) {
- return $( "<li></li>" )
- .data(
"item.autocomplete", item )
- .append( "<a>"
+ item.artifactId + "</a>" )
- .appendTo( ul );
- };
+ select: function(event, ui) {
+ $.log("select artifactId:" + ui.item.artifactId);
+ window.sammyArchivaApplication.setLocation("#quicksearch~" +
ui.item.artifactId);
+ }
+ }).data("autocomplete")._renderItem = function(ul, item) {
+ return $("<li></li>")
+ .data("item.autocomplete", item)
+ .append("<a>" + item.artifactId + "</a>")
+ .appendTo(ul);
+ };
- }
+ };
});
Modified:
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js?rev=1480100&r1=1480099&r2=1480100&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js
(original)
+++
archiva/branches/archiva-MRM-1756/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/repository-groups.js
Tue May 7 21:42:38 2013
@@ -245,7 +245,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
}
);
- }
+ };
this.addRepositoryGroup=function(repositoryGroup){
clearUserMessages();
