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/11/28 22:13:45 UTC
svn commit: r1414925 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/
archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/
Author: olamy
Date: Wed Nov 28 21:13:44 2012
New Revision: 1414925
URL: http://svn.apache.org/viewvc?rev=1414925&view=rev
Log:
[MRM-1718] ldap configuration editable with the ui.
start javascript model.
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaLdapConfiguration.java (with props)
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
Added: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaLdapConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaLdapConfiguration.java?rev=1414925&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaLdapConfiguration.java (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaLdapConfiguration.java Wed Nov 28 21:13:44 2012
@@ -0,0 +1,173 @@
+package org.apache.archiva.admin.model.beans;
+/*
+ * 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.
+ */
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author Olivier Lamy
+ * @since 1.4-M4
+ */
+@XmlRootElement ( name = "archivaLdapConfiguration" )
+public class ArchivaLdapConfiguration
+{
+
+
+ /**
+ * The LDAP host.
+ */
+ private String hostName;
+
+ /**
+ * The LDAP port.
+ */
+ private String port;
+
+ /**
+ * ssl LDAP connection.
+ */
+ private boolean ssl = false;
+
+ /**
+ * The LDAP base dn.
+ */
+ private String baseDn;
+
+ /**
+ * contextFactory to use.
+ */
+ private String contextFactory;
+
+ /**
+ * The LDAP bind dn.
+ */
+ private String bindDn;
+
+ /**
+ * The LDAP password.
+ */
+ private String password;
+
+ /**
+ * The LDAP authenticationMethod.
+ */
+ private String authenticationMethod;
+
+ /**
+ * Field extraProperties.
+ */
+ private Map<String, String> extraProperties = new HashMap<String, String>();
+
+ public ArchivaLdapConfiguration()
+ {
+ // no op
+ }
+
+ public String getHostName()
+ {
+ return hostName;
+ }
+
+ public void setHostName( String hostName )
+ {
+ this.hostName = hostName;
+ }
+
+ public String getPort()
+ {
+ return port;
+ }
+
+ public void setPort( String port )
+ {
+ this.port = port;
+ }
+
+ public boolean isSsl()
+ {
+ return ssl;
+ }
+
+ public void setSsl( boolean ssl )
+ {
+ this.ssl = ssl;
+ }
+
+ public String getBaseDn()
+ {
+ return baseDn;
+ }
+
+ public void setBaseDn( String baseDn )
+ {
+ this.baseDn = baseDn;
+ }
+
+ public String getContextFactory()
+ {
+ return contextFactory;
+ }
+
+ public void setContextFactory( String contextFactory )
+ {
+ this.contextFactory = contextFactory;
+ }
+
+ public String getBindDn()
+ {
+ return bindDn;
+ }
+
+ public void setBindDn( String bindDn )
+ {
+ this.bindDn = bindDn;
+ }
+
+ public String getPassword()
+ {
+ return password;
+ }
+
+ public void setPassword( String password )
+ {
+ this.password = password;
+ }
+
+ public String getAuthenticationMethod()
+ {
+ return authenticationMethod;
+ }
+
+ public void setAuthenticationMethod( String authenticationMethod )
+ {
+ this.authenticationMethod = authenticationMethod;
+ }
+
+ public Map<String, String> getExtraProperties()
+ {
+ return extraProperties;
+ }
+
+ public void setExtraProperties( Map<String, String> extraProperties )
+ {
+ this.extraProperties = extraProperties;
+ }
+}
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaLdapConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaLdapConfiguration.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java?rev=1414925&r1=1414924&r2=1414925&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/ArchivaRuntimeConfiguration.java Wed Nov 28 21:13:44 2012
@@ -25,12 +25,14 @@ import java.io.Serializable;
* @author Olivier Lamy
* @since 1.4-M4
*/
-@XmlRootElement ( name = "archivaRuntimeConfiguration" )
+@XmlRootElement (name = "archivaRuntimeConfiguration")
public class ArchivaRuntimeConfiguration
implements Serializable
{
private String userManagerImpl = "jdo";
+ private ArchivaLdapConfiguration archivaLdapConfiguration;
+
public ArchivaRuntimeConfiguration()
{
// no op
@@ -45,4 +47,14 @@ public class ArchivaRuntimeConfiguration
{
this.userManagerImpl = userManagerImpl;
}
+
+ public ArchivaLdapConfiguration getArchivaLdapConfiguration()
+ {
+ return archivaLdapConfiguration;
+ }
+
+ public void setArchivaLdapConfiguration( ArchivaLdapConfiguration archivaLdapConfiguration )
+ {
+ this.archivaLdapConfiguration = archivaLdapConfiguration;
+ }
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1414925&r1=1414924&r2=1414925&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js Wed Nov 28 21:13:44 2012
@@ -1151,8 +1151,39 @@ define("archiva.general-admin",["jquery"
}
- ArchivaRuntimeConfiguration=function(userManagerImpl){
+ ArchivaRuntimeConfiguration=function(userManagerImpl,archivaLdapConfiguration){
this.userManagerImpl=ko.observable(userManagerImpl);
+ this.archivaLdapConfiguration=ko.observable(archivaLdapConfiguration);
+ }
+
+ ArchivaLdapConfiguration=function(hostName,port,ssl,baseDn,contextFactory,bindDn,password,authenticationMethod,
+ extraProperties){
+ //private String hostName;
+ this.hostName=ko.observable(hostName);
+
+ //private String port;
+ this.port=ko.observable(port);
+
+ //private boolean ssl = false;
+ this.ssl=ko.observable(ssl);
+
+ //private String baseDn;
+ this.baseDn=ko.observable(baseDn);
+
+ //private String contextFactory;
+ this.contextFactory=ko.observable(contextFactory);
+
+ //private String bindDn;
+ this.bindDn=ko.observable(bindDn);
+
+ //private String password;
+ this.password=ko.observable(password);
+
+ //private String authenticationMethod;
+ this.authenticationMethod=ko.observable(authenticationMethod);
+
+ //private Map<String, String> extraProperties = new HashMap<String, String>();
+ this.extraProperties=ko.observableArray(extraProperties);
}
ArchivaRuntimeConfigurationViewModel=function(archivaRuntimeConfiguration,userManagerImplementationInformations){