[dna-commits] DNA SVN: r1148 - in branches/eclipse/dna-web-jcr-rest-client/src: main/java/org/jboss/dna/web/jcr/rest/client/domain and 6 other directories.

Author: elvisisking Date: 2009-08-05 15:38:11 -0400 (Wed, 05 Aug 2009) New Revision: 1148 Added: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerAuthenticator.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/package-info.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/package-info.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/package-info.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/package-info.java Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IJcrConstants.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IMessages.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IRestClient.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IServerRegistryListener.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Logger.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerManager.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerRegistryEvent.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Status.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Utils.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/IDnaObject.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Repository.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Server.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Workspace.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/RepositoryValidator.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/ServerValidator.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/WorkspaceValidator.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FileNode.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FolderNode.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/IJsonConstants.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonNode.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClient.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonUtils.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/RepositoryNode.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/ServerNode.java branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/WorkspaceNode.java branches/eclipse/dna-web-jcr-rest-client/src/main/resources/org/jboss/dna/web/jcr/rest/client/Messages.properties branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/MockRestExecutor.java branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/ServerManagerTest.java branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/StatusTest.java branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/RepositoryTest.java branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/ServerTest.java branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/WorkspaceTest.java branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClientTest.java Log: Remove @author tags, added class javadocs, and created package-info.java classes. Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IJcrConstants.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IJcrConstants.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IJcrConstants.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -24,7 +24,9 @@ package org.jboss.dna.web.jcr.rest.client; /** - * @author Dan Florian + * The <code>IJcrContants</code> class provides constants for the commonly used JCR types and property identifiers. + * + * @since 0.6 */ public interface IJcrConstants { @@ -55,14 +57,14 @@ * @since 0.6 */ String FOLDER_NODE_TYPE = "nt:folder"; //$NON-NLS-1$ - + /** * The JCR data property name (<code>jcr:lastModified</code>). * * @since 0.6 */ String LAST_MODIFIED = "jcr:lastModified"; //$NON-NLS-1$ - + /** * The JCR data property name (<code>jcr:lastModified</code>). * Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IMessages.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IMessages.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IMessages.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -26,9 +26,8 @@ import java.util.ResourceBundle; /** - * I18N messages found in the Messages.properties file. + * The <code>IMessages</code> interface are the resource bundle keys used in the <code>Messages.properties</code> file. * - * @author Dan Florian * @since 0.6 */ public interface IMessages { @@ -94,7 +93,7 @@ String PublishFailedMsg = "PublishFailedMsg"; //$NON-NLS-1$ String UnpublishFailedMsg = "UnpublishFailedMsg"; //$NON-NLS-1$ - + String UnpublishNeverPublishedMsg = "UnpublishNeverPublishedMsg"; //$NON-NLS-1$ } Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IRestClient.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IRestClient.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IRestClient.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -31,11 +31,15 @@ import org.jboss.dna.web.jcr.rest.client.domain.Workspace; /** - * @author dan + * The <code>IRestClient</code> interface is the API for all REST clients used by the Eclipse DNA plugin. + * + * @since 0.6 */ public interface IRestClient { /** + * Obtains the DNA repositories defined within the specified server. + * * @param server the server whose repositories are being requested (never <code>null</code>) * @return the repositories within the specified server (never <code>null</code>) * @throws Exception if there is a problem obtaining the repositories @@ -44,6 +48,8 @@ Collection<Repository> getRepositories( Server server ) throws Exception; /** + * Obtains the workspaces defined within the specified DNA respository. + * * @param repository the repository whose workspaces are being requested (never <code>null</code>) * @return the workspaces within the specified repository (never <code>null</code>) * @throws Exception if there is a problem obtaining the workspaces @@ -52,6 +58,8 @@ Collection<Workspace> getWorkspaces( Repository repository ) throws Exception; /** + * Publishes, or uploads, a local file to the workspace at the specified path. + * * @param workspace the workspace where the resource will be published (never <code>null</code>) * @param path the path to the folder where the file will be published (never <code>null</code>) * @param file the resource being published (never <code>null</code>) @@ -63,7 +71,8 @@ File file ); /** - * If a file being unpublished is not found in the workspace an {@link Severity#INFO info status} results. + * Unpublishes, or deletes, the resource at the specified path in the workspace. If a file being unpublished is not found in + * the workspace an {@link Severity#INFO info status} is returned. * * @param workspace the workspace where the resource will be unpublished (never <code>null</code>) * @param path the path to the folder where the file is published (never <code>null</code>) Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IServerRegistryListener.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IServerRegistryListener.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IServerRegistryListener.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -24,7 +24,8 @@ package org.jboss.dna.web.jcr.rest.client; /** - * @author Dan Florian + * The <code>IServerRegistryListener</code> interface defines the API for a server registry listener. + * * @since 0.6 */ public interface IServerRegistryListener { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Logger.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Logger.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Logger.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -27,7 +27,8 @@ import org.slf4j.LoggerFactory; /** - * @author Dan Florian + * The <code>Logger</code> class provides a basic interface into an Eclipse SLF4J implementation. + * * @since 0.6 */ public final class Logger { @@ -74,18 +75,22 @@ } /** - * @param clazz the class whose logger will be used - * @param status the status being logged + * @param clazz the class whose logger will be used (never <code>null</code>) + * @param status the status being logged (never <code>null</code>) * @since 0.6 */ public static void log( Class<?> clazz, Status status ) { + Utils.nullArgumentCheck("clazz", clazz); //$NON-NLS-1$ + Utils.nullArgumentCheck("status", status); //$NON-NLS-1$ + org.slf4j.Logger delegate = null; - + try { delegate = LoggerFactory.getLogger(clazz); } catch (Throwable e) { // adapter not found + System.err.println(status.getMessage()); return; } @@ -113,20 +118,25 @@ } /** - * @param clazz the class whose logger will be used - * @param status the status being logged (status message is a {@link MessageFormat} pattern) - * @param arguments the arguments to be inserted into the pattern + * @param clazz the class whose logger will be used (never <code>null</code>) + * @param status the status being logged whose message is a {@link MessageFormat} pattern (never <code>null</code>) + * @param arguments the arguments to be inserted into the pattern (never <code>null</code>) * @since 0.6 */ public static void log( Class<?> clazz, Status status, Object... arguments ) { + Utils.nullArgumentCheck("clazz", clazz); //$NON-NLS-1$ + Utils.nullArgumentCheck("status", status); //$NON-NLS-1$ + Utils.nullArgumentCheck("arguments", arguments); //$NON-NLS-1$ + org.slf4j.Logger delegate = null; - + try { delegate = LoggerFactory.getLogger(clazz); } catch (Throwable e) { // adapter not found + System.err.println(status.getMessage()); return; } @@ -162,18 +172,22 @@ /** * @param clazz the class whose logger will be used * @param e the error being logged or <code>null</code> - * @param msg the message being logged + * @param msg the message being logged (never <code>null</code>) * @since 0.6 */ public static void trace( Class<?> clazz, Throwable e, String msg ) { + Utils.nullArgumentCheck("clazz", clazz); //$NON-NLS-1$ + Utils.nullArgumentCheck("msg", msg); //$NON-NLS-1$ + org.slf4j.Logger delegate = null; - + try { delegate = LoggerFactory.getLogger(clazz); } catch (Throwable error) { // adapter not found + System.err.println(msg); return; } @@ -187,22 +201,27 @@ } /** - * @param clazz the class whose logger will be used + * @param clazz the class whose logger will be used (never <code>null</code>) * @param e the error being logged or <code>null</code> - * @param pattern the {@link MessageFormat} pattern - * @param arguments the arguments to be inserted into the pattern + * @param pattern the {@link MessageFormat} pattern (never <code>null</code>) + * @param arguments the arguments to be inserted into the pattern (never <code>null</code>) * @since 0.6 */ public static void trace( Class<?> clazz, Throwable e, String pattern, Object... arguments ) { + Utils.nullArgumentCheck("clazz", clazz); //$NON-NLS-1$ + Utils.nullArgumentCheck("pattern", pattern); //$NON-NLS-1$ + Utils.nullArgumentCheck("arguments", arguments); //$NON-NLS-1$ + org.slf4j.Logger delegate = null; - + try { delegate = LoggerFactory.getLogger(clazz); } catch (Throwable error) { // adapter not found + System.err.println(MessageFormat.format(pattern, arguments)); return; } Added: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerAuthenticator.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerAuthenticator.java (rev 0) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerAuthenticator.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -0,0 +1,129 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.dna.web.jcr.rest.client; + +import java.net.Authenticator; +import java.net.PasswordAuthentication; + +/** + * @since 0.6 + */ +public class ServerAuthenticator extends Authenticator { + + // =========================================================================================================================== + // Fields + // =========================================================================================================================== + + private final ServerManager serverManager; + + // =========================================================================================================================== + // Constructors + // =========================================================================================================================== + + public ServerAuthenticator( ServerManager serverManager ) { + this.serverManager = serverManager; + } + + // =========================================================================================================================== + // Methods + // =========================================================================================================================== + + /** + * {@inheritDoc} + * + * @see java.net.Authenticator#getPasswordAuthentication() + * @since 0.6 + */ + @Override + protected PasswordAuthentication getPasswordAuthentication() { + // URL url = getRequestingURL(); + return super.getPasswordAuthentication(); + } + + /* + public final class DelegatingAuthenticator extends Authenticator { + + private static DelegatingAuthenticator m_INSTANCE; + + private Map m_authenticators; + + static public DelegatingAuthenticator getInstance() { + synchronized (DelegatingAuthenticator.class) { + if (m_INSTANCE == null) { + m_INSTANCE = new DelegatingAuthenticator(); + Authenticator.setDefault(m_INSTANCE); + } + return m_INSTANCE; + } + } + + private DelegatingAuthenticator() { + m_authenticators = new HashMap(); + } + + public void addTransitAuthenticator( TransitAuthenticator authenticator, + RequestIdentifier id ) { + synchronized (m_authenticators) { + m_authenticators.put(id, authenticator); + } + } + + public void removeTransitAuthenticator( TransitAuthenticator authenticator ) { + synchronized (m_authenticators) { + Iterator list = m_authenticators.values().iterator(); + while (list.hasNext()) { + Authenticator item = (Authenticator)list.next(); + if (item.equals(authenticator)) { + list.remove(); + } + } + } + } + + protected PasswordAuthentication getPasswordAuthentication() { + try { + String host = getRequestingHost(); + String protocol = getRequestingProtocol(); + String prompt = getRequestingPrompt(); + String scheme = getRequestingScheme(); + int port = getRequestingPort(); + InetAddress addr = getRequestingSite(); + if (addr == null) { + addr = InetAddress.getByName(host); + } + RequestIdentifier id = new RequestIdentifier(addr, port, protocol, scheme, prompt); + synchronized (m_authenticators) { + TransitAuthenticator auth = (TransitAuthenticator)m_authenticators.get(id); + if (auth == null) { + return null; + } + return auth.resolvePasswordAuthentication(this); + } + } catch (UnknownHostException e) { + return null; + } + } + } + */ +} Property changes on: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerAuthenticator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerManager.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerManager.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerManager.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -55,9 +55,8 @@ import org.w3c.dom.NodeList; /** - * The Server Manager class managers the creation, deletion, and editing of servers. + * The <code>ServerManager</code> class managers the creation, deletion, and editing of servers hosting DNA repositories. * - * @author Dan Florian * @since 0.6 */ @ThreadSafe @@ -167,6 +166,9 @@ this.stateLocationPath = stateLocationPath; this.delegate = restExecutor; this.listeners = new CopyOnWriteArrayList<IServerRegistryListener>(); + + // TODO set authenticator here + // Authenticator.setDefault(new ServerAuthenticator()); } /** Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerRegistryEvent.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerRegistryEvent.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerRegistryEvent.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -26,7 +26,9 @@ import org.jboss.dna.web.jcr.rest.client.domain.Server; /** - * @author Dan Florian + * The <code>ServerRegistryEvent</code> class is the event that is broadcast from the {@link ServerManager server manager} when a + * server is added, removed, or changed. + * * @since 0.6 */ public final class ServerRegistryEvent { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Status.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Status.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Status.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -26,11 +26,12 @@ import net.jcip.annotations.Immutable; /** - * @author Dan Florian + * The <code>Status</code> class is an outcome that provides an outcome or result of an operation. + * * @since 0.6 */ @Immutable -public class Status { +public final class Status { // =========================================================================================================================== // Constants Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Utils.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Utils.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Utils.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -28,7 +28,8 @@ import java.text.MessageFormat; /** - * @author Dan Florian + * The <code>Utils</code> class contains common utilities used by this project. + * * @since 0.6 */ public final class Utils { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/IDnaObject.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/IDnaObject.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/IDnaObject.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -24,9 +24,8 @@ package org.jboss.dna.web.jcr.rest.client.domain; /** - * The IDnaObject class defines a business object. + * The <code>IDnaObject</code> class defines a DNA business object. * - * @author Dan Florian * @since 0.6 */ public interface IDnaObject { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Repository.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Repository.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Repository.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -32,7 +32,6 @@ /** * The Repository class is the business object for a DNA repository. * - * @author Dan Florian * @since 0.6 */ @Immutable @@ -133,7 +132,7 @@ * @since 0.6 */ public String getShortDescription() { - return Utils.getMessage(RepositoryShortDescription, this.name, this.server.getShortDescription()); + return Utils.getMessage(RepositoryShortDescription, this.name, this.server.getName()); } /** Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Server.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Server.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Server.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -31,9 +31,8 @@ import org.jboss.dna.web.jcr.rest.client.domain.validation.ServerValidator; /** - * The Server class is the business object for a server that is hosting one or more DNA repositories. + * The <code>Server</code> class is the business object for a server that is hosting one or more DNA repositories. * - * @author Dan Florian * @since 0.6 */ @Immutable Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Workspace.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Workspace.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Workspace.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -30,9 +30,8 @@ import org.jboss.dna.web.jcr.rest.client.domain.validation.WorkspaceValidator; /** - * The Workspace class is the business object for a DNA repository workspace. + * The <code>Workspace</code> class is the business object for a DNA repository workspace. * - * @author Dan Florian * @since 0.6 */ @Immutable @@ -139,7 +138,7 @@ * @since 0.6 */ public String getShortDescription() { - return Utils.getMessage(WorkspaceShortDescription, this.name, this.repository.getShortDescription()); + return Utils.getMessage(WorkspaceShortDescription, this.name, this.repository.getName()); } /** Added: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/package-info.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/package-info.java (rev 0) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/package-info.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -0,0 +1,29 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client domain package defines the DNA and JCR business objects. These include objects for + * {@link Server servers}, {@link Repository repositories}, and {@link Workspace workspaces}. + */ + +package org.jboss.dna.web.jcr.rest.client.domain; \ No newline at end of file Property changes on: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/RepositoryValidator.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/RepositoryValidator.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/RepositoryValidator.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -28,10 +28,12 @@ import static org.jboss.dna.web.jcr.rest.client.IMessages.RepositoryNullServerMsg; import org.jboss.dna.web.jcr.rest.client.Status; import org.jboss.dna.web.jcr.rest.client.Status.Severity; +import org.jboss.dna.web.jcr.rest.client.domain.Repository; import org.jboss.dna.web.jcr.rest.client.domain.Server; /** - * @author Dan Florian + * The <code>RepositoryValidator</code> class provides validation for creating a {@link Repository DNA repository}. + * * @since 0.6 */ public final class RepositoryValidator { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/ServerValidator.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/ServerValidator.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/ServerValidator.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -36,7 +36,8 @@ import org.jboss.dna.web.jcr.rest.client.domain.Server; /** - * @author Dan Florian + * The <code>ServerValidator</code> class provides validation for creating a {@link Server DNA server}. + * * @since 0.6 */ public final class ServerValidator { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/WorkspaceValidator.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/WorkspaceValidator.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/WorkspaceValidator.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -29,9 +29,11 @@ import org.jboss.dna.web.jcr.rest.client.Status; import org.jboss.dna.web.jcr.rest.client.Status.Severity; import org.jboss.dna.web.jcr.rest.client.domain.Repository; +import org.jboss.dna.web.jcr.rest.client.domain.Workspace; /** - * @author Dan Florian + * The <code>WorkspaceValidator</code> class provides validation for creating a {@link Workspace DNA workspace}. + * * @since 0.6 */ public final class WorkspaceValidator { Added: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/package-info.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/package-info.java (rev 0) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/package-info.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -0,0 +1,28 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client domain validation package controls the validation of new and changed DNA business objects. + */ + +package org.jboss.dna.web.jcr.rest.client.domain.validation; \ No newline at end of file Property changes on: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FileNode.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FileNode.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FileNode.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -41,7 +41,9 @@ import org.jboss.dna.web.jcr.rest.client.domain.Workspace; /** - * @author Dan Florian + * The <code>FileNode</code> class is responsible for knowing how to create a URL for a file, create a JSON representation of a + * file, and to create the appropriate JCR nodes for a file. + * * @since 0.6 */ @Immutable Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FolderNode.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FolderNode.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FolderNode.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -31,7 +31,9 @@ import org.jboss.dna.web.jcr.rest.client.domain.Workspace; /** - * @author Dan Florian + * The <code>FolderNode</code> class is responsible for knowing how to create a URL for a folder, create a JSON representation of + * a folder, and create the appropriate JCR nodes for a folder. + * * @since 0.6 */ @Immutable @@ -61,7 +63,7 @@ public FolderNode( Workspace workspace, String fullPath ) throws Exception { super(fullPath); - + Utils.nullArgumentCheck("workspace", workspace); //$NON-NLS-1$ Utils.nullArgumentCheck("fullPath", fullPath); //$NON-NLS-1$ Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/IJsonConstants.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/IJsonConstants.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/IJsonConstants.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -24,7 +24,9 @@ package org.jboss.dna.web.jcr.rest.client.json; /** - * @author Dan Florian + * The <code>IJsonConstants</code> interface provides JSON-specific constants used when JSON as a transport mechanism between the + * REST client and the REST server. + * * @since 0.6 */ public interface IJsonConstants { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonNode.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonNode.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonNode.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -28,7 +28,9 @@ import org.jboss.dna.web.jcr.rest.client.Utils; /** - * @author Dan Florian + * The <code>JsonNode</code> class defines the API for interacing with JSON objects. Every <code>JsonNode</code> knows how to + * create their URL and create their JCR content. + * * @since 0.6 */ public abstract class JsonNode extends JSONObject { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClient.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClient.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClient.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -49,7 +49,9 @@ import org.jboss.dna.web.jcr.rest.client.json.IJsonConstants.RequestMethod; /** - * @author Dan Florian + * The <code>JsonRestClient</code> class is an implementation of <code>IRestClient</code> that works with the DNA REST server that + * uses JSON as its interface protocol. + * * @since 0.6 */ public final class JsonRestClient implements IRestClient { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonUtils.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonUtils.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonUtils.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -32,7 +32,8 @@ import org.jboss.dna.web.jcr.rest.client.Utils; /** - * @author Dan Florian + * The <code>JsonUtils</code> class provides utilities needed to work with the DNA REST server JSON API. + * * @since 0.6 */ public final class JsonUtils { @@ -40,7 +41,7 @@ // =========================================================================================================================== // Class Methods // =========================================================================================================================== - + /** * The default character set being used. * @@ -55,7 +56,7 @@ /** * @param text the text whose escape sequences will be replaced with the actual characters (never <code>null</code>) * @return the decoded text - * @throws UnsupportedEncodingException + * @throws UnsupportedEncodingException * @since 0.6 */ public static String decodeEscaping( String text ) throws UnsupportedEncodingException { @@ -66,7 +67,7 @@ /** * @param text the text whose escape sequences will be replaced with the actual characters (never <code>null</code>) * @return the decoded text - * @throws UnsupportedEncodingException + * @throws UnsupportedEncodingException * @since 0.6 */ public static String encodeEscaping( String text ) throws UnsupportedEncodingException { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/RepositoryNode.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/RepositoryNode.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/RepositoryNode.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -33,7 +33,9 @@ import org.jboss.dna.web.jcr.rest.client.domain.Workspace; /** - * @author Dan Florian + * The <code>RepositoryNode</code> class is responsible for knowing how to create a URL for a repository and to parse a JSON + * response into {@link Workspace workspace} objects. + * * @since 0.6 */ public final class RepositoryNode extends JsonNode { Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/ServerNode.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/ServerNode.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/ServerNode.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -34,7 +34,9 @@ import org.jboss.dna.web.jcr.rest.client.domain.Server; /** - * @author Dan Florian + * The <code>ServerNode</code> class is responsible for knowing how to create a URL for a server, create a URL to obtain a + * server's repositories, and parse a JSON response into {@link Repository repository} objects. + * * @since 0.6 */ public final class ServerNode extends JsonNode { @@ -84,7 +86,10 @@ url.delete((url.length() - 1), (url.length() - 1)); } + // append server context and insert user url.append(IJsonConstants.SERVER_CONTEXT); + // url.insert(url.indexOf(":") + 1, this.server.getUser() + '@'); //$NON-NLS-1$ + return new URL(url.toString()); } Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/WorkspaceNode.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/WorkspaceNode.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/WorkspaceNode.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -27,7 +27,10 @@ import org.jboss.dna.web.jcr.rest.client.domain.Workspace; /** - * @author dan + * The <code>WorkspaceNode</code> class is responsible for knowing how to create a URL for a {@link Workspace workspace}. The URL + * can be used to publish and unpublish resources. + * + * @since 0.6 */ public class WorkspaceNode extends JsonNode { Added: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/package-info.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/package-info.java (rev 0) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/package-info.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -0,0 +1,29 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client JSON package defines an implementation of an + * {@link org.jboss.dna.web.jcr.rest.client.IRestClient DNA REST client}. Classes in this package are responsible for creating + * JSON requests and parsing JSON responses from the server into domain objects. + */ +package org.jboss.dna.web.jcr.rest.client.json; \ No newline at end of file Property changes on: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/package-info.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/package-info.java (rev 0) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/package-info.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -0,0 +1,33 @@ +/* + * JBoss DNA (http://www.jboss.org/dna) + * See the COPYRIGHT.txt file distributed with this work for information + * regarding copyright ownership. Some portions may be licensed + * to Red Hat, Inc. under one or more contributor license agreements. + * See the AUTHORS.txt file in the distribution for a full listing of + * individual contributors. + * + * JBoss DNA is free software. Unless otherwise indicated, all code in JBoss DNA + * is licensed to you under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * JBoss DNA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * The JBoss DNA REST Client is a lightweight, non-UI Maven project that interacts with the DNA REST server. A server + * registry managed by the {@link ServerManager server manager} is used to publish and unpublish files to/from DNA + * {@link org.jboss.dna.web.jcr.rest.client.domain.Repository repository} + * {@link org.jboss.dna.web.jcr.rest.client.domain.Workspace workspaces}. When a DNA + * {@link org.jboss.dna.web.jcr.rest.client.domain.Server server} is added, deleted, or updated in the registry the server manager + * notifies all registered listeners. + */ + +package org.jboss.dna.web.jcr.rest.client; \ No newline at end of file Property changes on: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/package-info.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/resources/org/jboss/dna/web/jcr/rest/client/Messages.properties =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/resources/org/jboss/dna/web/jcr/rest/client/Messages.properties 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/resources/org/jboss/dna/web/jcr/rest/client/Messages.properties 2009-08-05 19:38:11 UTC (rev 1148) @@ -29,13 +29,13 @@ RepositoryEmptyNameMsg = A repository name cannot be empty RepositoryNullServerMsg = A repository server cannot be null -RepositoryShortDescription = DNA Repository: Name: {0}, {1} +RepositoryShortDescription = DNA Repository - Name: {0}, Server: {1} ServerEmptyUserMsg = The user cannot be empty ServerEmptyUrlMsg = A server URL cannot be empty ServerExistsMsg = {0} already exists so it cannot be added ServerInvalidUrlMsg = The value "{0}" is not a valid server URL -ServerShortDescription = DNA Server: URL={0} User={1} +ServerShortDescription = DNA Server - URL: {0} User: {1} ServerManagerRegistryAddUnexpectedError = Unexpected error adding server to registry ServerManagerRegistryListenerError = This error was reported by an IServerRegistryListener @@ -47,7 +47,7 @@ WorkspaceEmptyNameMsg = A workspace name cannot be empty WorkspaceNullRepositoryMsg = A workspace repository cannot be null -WorkspaceShortDescription = DNA Repository Workspace: Name: {0}, {1} +WorkspaceShortDescription = DNA Workspace - Name: {0}, Repository: {1} # JsonRestClient messages Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/MockRestExecutor.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/MockRestExecutor.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/MockRestExecutor.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -30,7 +30,8 @@ import org.jboss.dna.web.jcr.rest.client.domain.Workspace; /** - * @author Dan Florian + * The <code>MockRestExecutor</code> class is a test <code>IRestClient</code> implementation that does nothing. + * * @since 0.6 */ public final class MockRestExecutor implements IRestClient { Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/ServerManagerTest.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/ServerManagerTest.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/ServerManagerTest.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -31,7 +31,8 @@ import org.junit.Test; /** - * @author Dan Florian + * The <code>ServerManagerTest</code> class is a test class for the {@link ServerManager server manager} object. + * * @since 0.6 */ public final class ServerManagerTest { Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/StatusTest.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/StatusTest.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/StatusTest.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -31,7 +31,8 @@ import org.junit.Test; /** - * @author Dan Florian + * The <code>StatusTest</code> class is a test class for the {@link Status status} object. + * * @since 0.6 */ public final class StatusTest { Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/RepositoryTest.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/RepositoryTest.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/RepositoryTest.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -32,7 +32,8 @@ import org.junit.Test; /** - * @author Dan Florian + * The <code>RepositoryTest</code> class is a test class for the {@link Repository repository} object. + * * @since 0.6 */ public final class RepositoryTest { Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/ServerTest.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/ServerTest.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/ServerTest.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -32,7 +32,8 @@ import org.junit.Test; /** - * @author Dan Florian + * The <code>ServerTest</code> class is a test class for the {@link Server server} object. + * * @since 0.6 */ public final class ServerTest { Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/WorkspaceTest.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/WorkspaceTest.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/WorkspaceTest.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -32,7 +32,8 @@ import org.junit.Test; /** - * @author Dan Florian + * The <code>WorkspaceTest</code> class is a test class for the {@link Workspace workspace} object. + * * @since 0.6 */ public final class WorkspaceTest { Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClientTest.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClientTest.java 2009-08-05 16:00:30 UTC (rev 1147) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClientTest.java 2009-08-05 19:38:11 UTC (rev 1148) @@ -40,7 +40,8 @@ import org.junit.Test; /** - * @author Dan Florian + * The <code>JsonRestClientTest</code> class is a test class for the {@link JsonRestClient JSON REST client} object. + * * @since 0.6 */ public final class JsonRestClientTest { @@ -120,7 +121,7 @@ // confirm it exists in repository assertThat(((JsonRestClient)this.restClient).pathExists(WORKSPACE1, WORKSPACE_PATH, file), is(true)); - + // TODO: get jcr:data and compare }