Author: elvisisking Date: 2009-09-10 17:38:13 -0400 (Thu, 10 Sep 2009) New Revision: 1205 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/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/RestClientI18n.java 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/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/test/java/org/jboss/dna/web/jcr/rest/client/MockRestClient.java branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/RestClientI18nTest.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: Removed @since javadoc tags. 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IJcrConstants.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -25,64 +25,46 @@ /** * The <code>IJcrContants</code> class provides constants for the commonly used JCR types and property identifiers. - * - * @since 0.6 */ public interface IJcrConstants { /** * The JCR content property name (<code>jcr:content</code>). - * - * @since 0.6 */ String CONTENT_PROPERTY = "jcr:content"; //$NON-NLS-1$ /** * The JCR data property name (<code>jcr:data</code>). - * - * @since 0.6 */ String DATA_PROPERTY = "jcr:data/base64/"; //$NON-NLS-1$ /** * The JCR file node type (<code>nt:file</code>). - * - * @since 0.6 */ String FILE_NODE_TYPE = "nt:file"; //$NON-NLS-1$ /** * The JCR folder node type (<code>nt:folder</code>). - * - * @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>). - * - * @since 0.6 */ String MIME_TYPE = "jcr:mimeType"; //$NON-NLS-1$ /** * The JCR primary type property name (<code>jcr:primaryType</code>). - * - * @since 0.6 */ String PRIMARY_TYPE_PROPERTY = "jcr:primaryType"; //$NON-NLS-1$ /** * The JCR resource node type (<code>nt:resource</code>). - * - * @since 0.6 */ String RESOURCE_NODE_TYPE = "nt:resource"; //$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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IRestClient.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -33,8 +33,6 @@ /** * The <code>IRestClient</code> interface is the API for all REST clients used by the Eclipse DNA plugin. - * - * @since 0.6 */ public interface IRestClient { @@ -44,7 +42,6 @@ * @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 - * @since 0.6 */ Collection<Repository> getRepositories( Server server ) throws Exception; @@ -54,7 +51,6 @@ * @param workspace the workspace where the file is/could be located (never <code>null</code>) * @return the workspace URL for the specified file (never <code>null</code>) * @throws Exception if there is a problem obtaining the URL or if the file is a directory - * @since 0.6 */ URL getUrl( File file, String path, @@ -66,7 +62,6 @@ * @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 - * @since 0.6 */ Collection<Workspace> getWorkspaces( Repository repository ) throws Exception; @@ -77,7 +72,6 @@ * @param path the unencoded path to the folder where the file will be published (never <code>null</code>) * @param file the resource being published (never <code>null</code>) * @return a status of the publishing operation outcome (never <code>null</code>) - * @since 0.6 */ Status publish( Workspace workspace, String path, @@ -91,7 +85,6 @@ * @param path the unencoded path to the folder where the file is published (never <code>null</code>) * @param file the file being unpublished (never <code>null</code>) * @return a status of the unpublishing operation outcome (never <code>null</code>) - * @since 0.6 */ Status unpublish( Workspace workspace, String path, 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/IServerRegistryListener.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -25,15 +25,12 @@ /** * The <code>IServerRegistryListener</code> interface defines the API for a server registry listener. - * - * @since 0.6 */ public interface IServerRegistryListener { /** * @param event the event being processed (never <code>null</code>) * @return any errors caught during the processing or <code>null</code> - * @since 0.6 */ Exception[] serverRegistryChanged( ServerRegistryEvent event ); Modified: branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/RestClientI18n.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/RestClientI18n.java 2009-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/RestClientI18n.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -27,8 +27,6 @@ /** * The <code>RestClientI18n</code> class provides localized messages. - * - * @since 0.6 */ public final class RestClientI18n { Modified: 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 2009-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerAuthenticator.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -29,8 +29,6 @@ /** * The <code>ServerAuthenticator</code> class provides user names and passwords to the HTTP connection. - * - * @since 0.6 */ public class ServerAuthenticator extends Authenticator { @@ -42,7 +40,6 @@ * {@inheritDoc} * * @see java.net.Authenticator#getPasswordAuthentication() - * @since 0.6 */ @Override protected PasswordAuthentication getPasswordAuthentication() { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerManager.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -59,8 +59,6 @@ /** * The <code>ServerManager</code> class managers the creation, deletion, and editing of servers hosting DNA repositories. - * - * @since 0.6 */ @ThreadSafe public final class ServerManager implements IRestClient { @@ -71,43 +69,31 @@ /** * The tag used to persist a server's login password. - * - * @since 0.6 */ private static final String PASSWORD_TAG = "password"; //$NON-NLS-1$ /** * The file name used when persisting the server registry. - * - * @since 0.6 */ private static final String REGISTRY_FILE = "serverRegistry.xml"; //$NON-NLS-1$ /** * The tag used when persisting a server. - * - * @since 0.6 */ private static final String SERVER_TAG = "server"; //$NON-NLS-1$ /** * The server collection tag used when persisting the server registry. - * - * @since 0.6 */ private static final String SERVERS_TAG = "servers"; //$NON-NLS-1$ /** * The tag used to persist a server's URL. - * - * @since 0.6 */ private static final String URL_TAG = "url"; //$NON-NLS-1$ /** * The tag used to persist a server's login user. - * - * @since 0.6 */ private static final String USER_TAG = "user"; //$NON-NLS-1$ @@ -120,7 +106,6 @@ * getWorkspaces() operations. Setting a thread variable was a way to do that. * * @see ServerAuthenticator - * @since 0.6 */ private static ThreadLocal<Server> currentServer = new ThreadLocal<Server>(); @@ -130,7 +115,6 @@ /** * @return the server set on the current thread or <code>null</code> - * @since 0.6 */ public static Server getCurrentServer() { return ServerManager.currentServer.get(); @@ -142,44 +126,32 @@ /** * The listeners registered to receive {@link ServerRegistryEvent server registry events}. - * - * @since 0.6 */ private final CopyOnWriteArrayList<IServerRegistryListener> listeners; /** * Executes the commands run on the DNA REST server. - * - * @since 0.6 */ private final IRestClient delegate; /** * The logger. - * - * @since 0.6 */ private final Logger logger = Logger.getLogger(ServerManager.class); /** * The path where the server registry is persisted or <code>null</code> if not persisted. - * - * @since 0.6 */ private final String stateLocationPath; /** * The server registry. - * - * @since 0.6 */ @GuardedBy( "serverLock" ) private final List<Server> servers; /** * Lock used for when accessing the server registry. - * - * @since 0.6 */ private final ReadWriteLock serverLock = new ReentrantReadWriteLock(); @@ -191,7 +163,6 @@ * @param stateLocationPath the directory where the {@link Server} registry} is persisted (may be <code>null</code> if * persistence is not desired) * @param restClient the client that will communicate with the DNA REST server (never <code>null</code>) - * @since 0.6 */ public ServerManager( String stateLocationPath, IRestClient restClient ) { @@ -211,7 +182,6 @@ * * @param stateLocationPath the directory where the {@link Server} registry} is persisted (may be <code>null</code> if * persistence is not desired) - * @since 0.6 */ public ServerManager( String stateLocationPath ) { this(stateLocationPath, new JsonRestClient()); @@ -226,7 +196,6 @@ * * @param listener the listener being register to receive events (never <code>null</code>) * @return <code>true</code> if listener was added - * @since 0.6 */ public boolean addRegistryListener( IServerRegistryListener listener ) { CheckArg.isNotNull(listener, "listener"); //$NON-NLS-1$ @@ -245,7 +214,6 @@ * * @param server the server being added (never <code>null</code>) * @return a status indicating if the server was added to the registry - * @since 0.6 */ public Status addServer( Server server ) { CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ @@ -273,7 +241,6 @@ /** * @return an unmodifiable collection of registered servers (never <code>null</code>) - * @since 0.6 */ public Collection<Server> getServers() { try { @@ -286,7 +253,6 @@ /** * @return the name of the state file that the server registry is persisted to or <code>null</code> - * @since 0.6 */ private String getStateFileName() { String name = this.stateLocationPath; @@ -304,7 +270,6 @@ * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getRepositories(org.jboss.dna.web.jcr.rest.client.domain.Server) * @throws RuntimeException if the server is not registered * @see #isRegistered(Server) - * @since 0.6 */ public Collection<Repository> getRepositories( Server server ) throws Exception { CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ @@ -330,7 +295,6 @@ * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getUrl(java.io.File, java.lang.String, * org.jboss.dna.web.jcr.rest.client.domain.Workspace) - * @since 0.6 */ public URL getUrl( File file, String path, @@ -344,7 +308,6 @@ * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getWorkspaces(org.jboss.dna.web.jcr.rest.client.domain.Repository) * @throws RuntimeException if the server is not registered * @see #isRegistered(Server) - * @since 0.6 */ public Collection<Workspace> getWorkspaces( Repository repository ) throws Exception { CheckArg.isNotNull(repository, "repository"); //$NON-NLS-1$ @@ -372,7 +335,6 @@ * @param server the server being added * @param notifyListeners indicates if registry listeners should be notified * @return a status indicating if the server was added to the registry - * @since 0.6 */ private Status internalAddServer( Server server, boolean notifyListeners ) { @@ -405,7 +367,6 @@ * @param server the server being removed * @param notifyListeners indicates if registry listeners should be notified * @return a status indicating if the specified server was removed from the registry - * @since 0.6 */ private Status internalRemoveServer( Server server, boolean notifyListeners ) { @@ -443,7 +404,6 @@ * @param server the server being tested (never <code>null</code>) * @return <code>true</code> if the server has been registered * @see #addServer(Server) - * @since 0.6 */ public boolean isRegistered( Server server ) { CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ @@ -467,7 +427,6 @@ /** * @param event the event the registry listeners are to process * @return any errors thrown by or found by the listeners or <code>null</code> (never empty) - * @since 0.6 */ private Exception[] notifyRegistryListeners( ServerRegistryEvent event ) { Collection<Exception> errors = null; @@ -502,7 +461,6 @@ /** * @param errors the errors reported by the registry listeners * @return a status indicating if registry listeners reported any errors - * @since 0.6 */ private Status processRegistryListenerErrors( Exception[] errors ) { if (errors == null) { @@ -522,7 +480,6 @@ * @param server the server being pinged (never <code>null</code>) * @return a status indicating if the server can be connected to * @see #isRegistered(Server) - * @since 0.6 */ public Status ping( Server server ) { CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ @@ -544,7 +501,6 @@ * @see org.jboss.dna.web.jcr.rest.client.IRestClient#publish(org.jboss.dna.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) * @see #isRegistered(Server) - * @since 0.6 */ public Status publish( Workspace workspace, String path, @@ -567,7 +523,6 @@ /** * @param listener the listener being unregistered and will no longer receive events (never <code>null</code>) * @return <code>true</code> if listener was removed - * @since 0.6 */ public boolean removeRegistryListener( IServerRegistryListener listener ) { CheckArg.isNotNull(listener, "listener"); //$NON-NLS-1$ @@ -577,7 +532,6 @@ /** * @param server the server being removed (never <code>null</code>) * @return a status indicating if the specified server was removed from the registry (never <code>null</code>) - * @since 0.6 */ public Status removeServer( Server server ) { CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ @@ -586,7 +540,6 @@ /** * @return a status indicating if the previous session state was restored successfully - * @since 0.6 */ public Status restoreState() { if (this.stateLocationPath != null) { @@ -629,7 +582,6 @@ * Saves the {@link Server} registry to the file system. * * @return a status indicating if the registry was successfully saved - * @since 0.6 */ public Status saveState() { if ((this.stateLocationPath != null) && !getServers().isEmpty()) { @@ -678,7 +630,6 @@ /** * @return <code>true</code> if the state file already exists - * @since 0.6 */ private boolean stateFileExists() { return new File(getStateFileName()).exists(); @@ -692,7 +643,6 @@ * @see org.jboss.dna.web.jcr.rest.client.IRestClient#unpublish(org.jboss.dna.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) * @see #isRegistered(Server) - * @since 0.6 */ public Status unpublish( Workspace workspace, String path, @@ -718,7 +668,6 @@ * @param previousServerVersion the version of the server being replaced (never <code>null</code>) * @param newServerVersion the new version of the server being put in the server registry (never <code>null</code>) * @return a status indicating if the server was updated in the registry (never <code>null</code>) - * @since 0.6 */ public Status updateServer( Server previousServerVersion, Server newServerVersion ) { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/ServerRegistryEvent.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -29,8 +29,6 @@ /** * 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 { @@ -40,28 +38,20 @@ /** * The status severity levels. - * - * @since 0.6 */ private enum Type { /** * Indicates that a new server was added to the server registry. - * - * @since 0.6 */ NEW, /** * Indicates that a server was removed from the server registry. - * - * @since 0.6 */ REMOVE, /** * Indicates that properties of an existing server in the registry has been changed. - * - * @since 0.6 */ UPDATE } @@ -75,7 +65,6 @@ * @param newServer the server that was added to the server registry (never <code>null</code>) * @return the event (never <code>null</code>) * @see Type#NEW - * @since 0.6 */ public static ServerRegistryEvent createNewEvent( ServerManager serverManager, Server newServer ) { @@ -89,7 +78,6 @@ * @param removedServer the server removed from the server registry (never <code>null</code>) * @return the event (never <code>null</code>) * @see Type#REMOVE - * @since 0.6 */ public static ServerRegistryEvent createRemoveEvent( ServerManager serverManager, Server removedServer ) { @@ -104,7 +92,6 @@ * @param newServerVersion the updated version of the server (never <code>null</code>) * @return the event (never <code>null</code>) * @see Type#UPDATE - * @since 0.6 */ public static ServerRegistryEvent createUpdateEvent( ServerManager serverManager, Server previousServerVersion, @@ -124,29 +111,21 @@ /** * The server being added, removed, or updated. - * - * @since 0.6 */ private final Server server; /** * The server manager in charge of the server registry the event is associated with. - * - * @since 0.6 */ private final ServerManager serverManager; /** * The event type. - * - * @since 0.6 */ private final Type type; /** * The server that is replacing an existing server. Will be <code>null</code> for all types except {@link Type#UPDATE update}. - * - * @since 0.6 */ private Server updatedServer; @@ -158,7 +137,6 @@ * @param serverManager the server manager sourcing this event * @param type the event type * @param server the server being added, removed, or updated - * @since 0.6 */ private ServerRegistryEvent( ServerManager serverManager, Type type, @@ -174,7 +152,6 @@ /** * @return the added, removed, or the old version of the server that has been updated - * @since 0.6 */ public Server getServer() { return this.server; @@ -182,7 +159,6 @@ /** * @return the server manager sourcing this event - * @since 0.6 */ public ServerManager getServerManager() { return this.serverManager; @@ -192,7 +168,6 @@ * @return the new version of an existing server that has been updated * @throws UnsupportedOperationException if method is called when the type is not an update * @see Type#UPDATE - * @since 0.6 */ public Server getUpdatedServer() { if (this.type != Type.UPDATE) { @@ -205,7 +180,6 @@ /** * @return <code>true</code> if the event is adding a new server to the registry * @see Type#NEW - * @since 0.6 */ public boolean isNew() { return (this.type == Type.NEW); @@ -214,7 +188,6 @@ /** * @return <code>true</code> if the event is removing a server from the registry * @see Type#REMOVE - * @since 0.6 */ public boolean isRemove() { return (this.type == Type.REMOVE); @@ -223,7 +196,6 @@ /** * @return <code>true</code> if the event is updating properties of an existing server in the registry * @see Type#UPDATE - * @since 0.6 */ public boolean isUpdate() { return (this.type == Type.UPDATE); 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Status.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -27,8 +27,6 @@ /** * The <code>Status</code> class is an outcome that provides an outcome or result of an operation. - * - * @since 0.6 */ @Immutable public final class Status { @@ -39,42 +37,30 @@ /** * The status severity levels. - * - * @since 0.6 */ public enum Severity { /** * Indicates an error status. - * - * @since 0.6 */ ERROR, /** * Indicates an informational status. - * - * @since 0.6 */ INFO, /** * Indicates an OK status. - * - * @since 0.6 */ OK, /** * Indicates an unknown status. This is automatically assigned if status is constructed with a <code>null</code> severity. - * - * @since 0.6 */ UNKNOWN, /** * Indicates a warning status. - * - * @since 0.6 */ WARNING } @@ -83,7 +69,6 @@ * A status with an OK severity and no message and no exception. * * @see Severity#OK - * @since 0.6 */ public static final Status OK_STATUS = new Status(Severity.OK, null, null); @@ -93,22 +78,16 @@ /** * The exception of this status or <code>null</code>. - * - * @since 0.6 */ private final Throwable exception; /** * The localized message of this status (can be <code>null</code>). - * - * @since 0.6 */ private final String message; /** * The severity level of this status (never <code>null</code>). - * - * @since 0.6 */ private final Severity severity; @@ -120,7 +99,6 @@ * @param severity the status severity (if <code>null</code> it will be converted to {@link Severity#UNKNOWN}. * @param message the status message (if <code>null</code> it will be returned as an empty string) * @param exception the status exception or <code>null</code> - * @since 0.6 */ public Status( Severity severity, String message, @@ -136,7 +114,6 @@ /** * @return the status exception (may be <code>null</code>) - * @since 0.6 */ public Throwable getException() { return this.exception; @@ -144,7 +121,6 @@ /** * @return the status message (never <code>null</code> but can be empty) - * @since 0.6 */ public String getMessage() { return ((this.message == null) ? "" : this.message); //$NON-NLS-1$ @@ -152,7 +128,6 @@ /** * @return severity the status severity (never <code>null</code>) - * @since 0.6 */ public Severity getSeverity() { return this.severity; @@ -160,7 +135,6 @@ /** * @return <code>true</code> if the status has a severity of {@link Severity#ERROR error}. - * @since 0.6 */ public boolean isError() { return (this.severity == Severity.ERROR); @@ -168,7 +142,6 @@ /** * @return <code>true</code> if the status has a severity of {@link Severity#INFO info}. - * @since 0.6 */ public boolean isInfo() { return (this.severity == Severity.INFO); @@ -176,7 +149,6 @@ /** * @return <code>true</code> if the status has a severity of {@link Severity#OK OK}. - * @since 0.6 */ public boolean isOk() { return (this.severity == Severity.OK); @@ -184,7 +156,6 @@ /** * @return <code>true</code> if the status has a severity of {@link Severity#UNKNOWN unknown}. - * @since 0.6 */ public boolean isUnknown() { return (this.severity == Severity.UNKNOWN); @@ -192,7 +163,6 @@ /** * @return <code>true</code> if the status has a severity of {@link Severity#WARNING warning}. - * @since 0.6 */ public boolean isWarning() { return (this.severity == Severity.WARNING); @@ -202,7 +172,6 @@ * {@inheritDoc} * * @see java.lang.Object#toString() - * @since 0.6 */ @Override public String toString() { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/Utils.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -30,8 +30,6 @@ /** * The <code>Utils</code> class contains common utilities used by this project. - * - * @since 0.6 */ public final class Utils { @@ -50,7 +48,6 @@ * @param thisObj an object being compared (may be <code>null</code>) * @param thatObj the other object being compared (may be <code>null</code>) * @return <code>true</code> if both objects are <code>null</code> or both are not <code>null</code> and equal - * @since 0.6 */ public static boolean equivalent( Object thisObj, Object thatObj ) { @@ -67,7 +64,6 @@ * @param file the file whose mime type is being requested * @return the mime type or the default mime type (<code>"application/octet-stream"</code>) if one can't be determined from * the file extension (never <code>null</code>) - * @since 0.6 */ public static String getMimeType( File file ) { // TODO write test for getMimeType(File) @@ -88,8 +84,6 @@ /** * Don't allow construction. - * - * @since 0.6 */ public Utils() { // nothing to do 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/IDnaObject.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -25,20 +25,16 @@ /** * The <code>IDnaObject</code> class defines a DNA business object. - * - * @since 0.6 */ public interface IDnaObject { /** * @return the object name (never <code>null</code>) - * @since 0.6 */ String getName(); /** * @return a description suitable for use in a tooltip (never <code>null</code>) - * @since 0.6 */ String getShortDescription(); 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Repository.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -32,8 +32,6 @@ /** * The Repository class is the business object for a DNA repository. - * - * @since 0.6 */ @Immutable public final class Repository implements IDnaObject { @@ -44,15 +42,11 @@ /** * The repository name. - * - * @since 0.6 */ private final String name; /** * The server where this repository resides. - * - * @since 0.6 */ private final Server server; @@ -69,7 +63,6 @@ * @param server the server where this repository resides (never <code>null</code>) * @see RepositoryValidator * @throws RuntimeException if any of the input parameters are invalid - * @since 0.6 */ public Repository( String name, Server server ) { @@ -96,7 +89,6 @@ * {@inheritDoc} * * @see java.lang.Object#equals(java.lang.Object) - * @since 0.6 */ @Override public boolean equals( Object obj ) { @@ -112,7 +104,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.domain.IDnaObject#getName() - * @since 0.6 */ public String getName() { return this.name; @@ -120,7 +111,6 @@ /** * @return the server where this repository is located (never <code>null</code>) - * @since 0.6 */ public Server getServer() { return this.server; @@ -130,7 +120,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.domain.IDnaObject#getShortDescription() - * @since 0.6 */ public String getShortDescription() { return RestClientI18n.repositoryShortDescription.text(this.name, this.server.getName()); @@ -140,7 +129,6 @@ * {@inheritDoc} * * @see java.lang.Object#hashCode() - * @since 0.6 */ @Override public int hashCode() { @@ -151,7 +139,6 @@ * {@inheritDoc} * * @see java.lang.Object#toString() - * @since 0.6 */ @Override public String toString() { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Server.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -34,8 +34,6 @@ /** * The <code>Server</code> class is the business object for a server that is hosting one or more DNA repositories. - * - * @since 0.6 */ @Immutable public final class Server implements IDnaObject { @@ -46,29 +44,21 @@ /** * The password to use when logging on to the server. - * - * @since 0.6 */ private final String password; /** * Indicates if the password should be stored locally when the server is persisted. - * - * @since 0.6 */ private final boolean persistPassword; /** * The server URL. - * - * @since 0.6 */ private final String url; /** * The user name to use when logging on to the server. - * - * @since 0.6 */ private final String user; @@ -85,7 +75,6 @@ * @param persistPassword <code>true</code> if the password should be stored * @see RepositoryValidator * @throws RuntimeException if any of the input parameters are invalid - * @since 0.6 */ public Server( String url, String user, @@ -115,7 +104,6 @@ * {@inheritDoc} * * @see java.lang.Object#equals(java.lang.Object) - * @since 0.6 */ @Override public boolean equals( Object obj ) { @@ -133,7 +121,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.domain.IDnaObject#getName() - * @since 0.6 */ public String getName() { return getUrl(); @@ -141,7 +128,6 @@ /** * @return the server authentication password - * @since 0.6 */ public String getPassword() { return this.password; @@ -151,7 +137,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.domain.IDnaObject#getShortDescription() - * @since 0.6 */ public String getShortDescription() { return RestClientI18n.serverShortDescription.text(this.url, this.user); @@ -159,7 +144,6 @@ /** * @return the server URL - * @since 0.6 */ public String getUrl() { return this.url; @@ -167,7 +151,6 @@ /** * @return the server authentication user - * @since 0.6 */ public String getUser() { return this.user; @@ -177,7 +160,6 @@ * {@inheritDoc} * * @see java.lang.Object#hashCode() - * @since 0.6 */ @Override public int hashCode() { @@ -195,7 +177,6 @@ /** * @return persistPassword <code>true</code> if the password is being persisted - * @since 0.6 */ public boolean isPasswordBeingPersisted() { return this.persistPassword; @@ -205,7 +186,6 @@ * {@inheritDoc} * * @see java.lang.Object#toString() - * @since 0.6 */ @Override public String toString() { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/Workspace.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -32,8 +32,6 @@ /** * The <code>Workspace</code> class is the business object for a DNA repository workspace. - * - * @since 0.6 */ @Immutable public final class Workspace implements IDnaObject { @@ -44,15 +42,11 @@ /** * The workspace name. - * - * @since 0.6 */ private final String name; /** * The repository where this workspace resides. - * - * @since 0.6 */ private final Repository repository; @@ -67,7 +61,6 @@ * @param repository the repository where this workspace resides (never <code>null</code>) * @see WorkspaceValidator * @throws RuntimeException if any of the input parameters are invalid - * @since 0.6 */ public Workspace( String name, Repository repository ) { @@ -94,7 +87,6 @@ * {@inheritDoc} * * @see java.lang.Object#equals(java.lang.Object) - * @since 0.6 */ @Override public boolean equals( Object obj ) { @@ -110,7 +102,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.domain.IDnaObject#getName() - * @since 0.6 */ public String getName() { return this.name; @@ -118,7 +109,6 @@ /** * @return the repository where this workspace is located (never <code>null</code>) - * @since 0.6 */ public Repository getRepository() { return this.repository; @@ -126,7 +116,6 @@ /** * @return the server where this workspace is located (never <code>null</code>) - * @since 0.6 */ public Server getServer() { return this.repository.getServer(); @@ -136,7 +125,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.domain.IDnaObject#getShortDescription() - * @since 0.6 */ public String getShortDescription() { return RestClientI18n.workspaceShortDescription.text(this.name, this.repository.getName()); @@ -146,7 +134,6 @@ * {@inheritDoc} * * @see java.lang.Object#hashCode() - * @since 0.6 */ @Override public int hashCode() { @@ -157,7 +144,6 @@ * {@inheritDoc} * * @see java.lang.Object#toString() - * @since 0.6 */ @Override public String toString() { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/RepositoryValidator.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -31,8 +31,6 @@ /** * The <code>RepositoryValidator</code> class provides validation for creating a {@link Repository DNA repository}. - * - * @since 0.6 */ public final class RepositoryValidator { @@ -43,7 +41,6 @@ /** * @param name the name being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isNameValid( String name ) { if ((name == null) || (name.length() == 0)) { @@ -56,7 +53,6 @@ /** * @param server the server being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isServerValid( Server server ) { if (server == null) { @@ -70,7 +66,6 @@ * @param name the name being validated * @param server the server being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isValid( String name, Server server ) { @@ -89,8 +84,6 @@ /** * Disallow construction. - * - * @since 0.6 */ private RepositoryValidator() { // nothing to do 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/ServerValidator.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -32,8 +32,6 @@ /** * The <code>ServerValidator</code> class provides validation for creating a {@link Server DNA server}. - * - * @since 0.6 */ public final class ServerValidator { @@ -44,7 +42,6 @@ /** * @param password the password being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isPasswordValid( String password ) { return Status.OK_STATUS; @@ -53,7 +50,6 @@ /** * @param url the URL being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isUrlValid( String url ) { if ((url == null) || (url.length() == 0)) { @@ -72,7 +68,6 @@ /** * @param user the user being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isUserValid( String user ) { if ((user == null) || (user.length() == 0)) { @@ -90,7 +85,6 @@ * @param password the password being validated * @param persistPassword <code>true</code> if the password should be persisted * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isValid( String url, String user, @@ -120,7 +114,6 @@ * @param serverManager the server manager controlling the server registry (may not be <code>null</code>) * @return a validation status (never <code>null</code>) * @see #isValid(String, String, String, boolean) - * @since 0.6 */ public static Status isValid( String url, String user, @@ -147,8 +140,6 @@ /** * Disallow construction. - * - * @since 0.6 */ private ServerValidator() { // nothing to do 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/domain/validation/WorkspaceValidator.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -31,8 +31,6 @@ /** * The <code>WorkspaceValidator</code> class provides validation for creating a {@link Workspace DNA workspace}. - * - * @since 0.6 */ public final class WorkspaceValidator { @@ -43,7 +41,6 @@ /** * @param name the name being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isNameValid( String name ) { if ((name == null) || (name.length() == 0)) { @@ -56,7 +53,6 @@ /** * @param repository the repository being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isRepositoryValid( Repository repository ) { if (repository == null) { @@ -70,7 +66,6 @@ * @param name the name being validated * @param repository the repository being validated * @return a validation status (never <code>null</code>) - * @since 0.6 */ public static Status isValid( String name, Repository repository ) { @@ -89,8 +84,6 @@ /** * Disallow construction. - * - * @since 0.6 */ private WorkspaceValidator() { // nothing to do 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FileNode.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -40,8 +40,6 @@ /** * 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 public final class FileNode extends JsonNode { @@ -52,22 +50,16 @@ /** * The file on the local file system. - * - * @since 0.6 */ private final File file; /** * The folder in the workspace where the file is or will be published or unpublished. - * - * @since 0.6 */ private final String path; /** * The workspace where the file is or will be published or unpublished. - * - * @since 0.6 */ private final Workspace workspace; @@ -80,7 +72,6 @@ * @param path the path in the workspace (never <code>null</code>) * @param file the file on the local file system (never <code>null</code>) * @throws Exception if there is a problem constructing the file node - * @since 0.6 */ public FileNode( Workspace workspace, String path, @@ -131,7 +122,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.json.JsonNode#getContent() - * @since 0.6 */ @Override public byte[] getContent() throws Exception { @@ -151,7 +141,6 @@ * @return the encoded file contents * @throws Exception if there is a problem obtaining the contents * @see #getFileContentsUrl() - * @since 0.6 */ String getFileContents( String jsonResponse ) throws Exception { CheckArg.isNotNull(jsonResponse, "jsonResponse"); //$NON-NLS-1$ @@ -166,7 +155,6 @@ * * @return the URL that can be used to obtain the encoded file contents from a workspace * @throws Exception if there is a problem constructing the URL - * @since 0.6 */ URL getFileContentsUrl() throws Exception { StringBuilder url = new StringBuilder(getUrl().toString()); @@ -176,7 +164,6 @@ /** * @return the path where the file is or will be published or unpublished - * @since 0.6 */ public String getPath() { return this.path; @@ -186,7 +173,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.json.JsonNode#getUrl() - * @since 0.6 */ @Override public URL getUrl() throws Exception { @@ -201,7 +187,6 @@ /** * @return the base 64 encoded file content * @throws Exception if there is a problem reading the file - * @since 0.6 */ String readFile() throws Exception { return Base64.encode(new FileInputStream(this.file.getAbsoluteFile())); 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/FolderNode.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -33,8 +33,6 @@ /** * 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 public final class FolderNode extends JsonNode { @@ -45,8 +43,6 @@ /** * The workspace where the file is being published. - * - * @since 0.6 */ private final Workspace workspace; @@ -58,7 +54,6 @@ * @param workspace the workspace being used (never <code>null</code>) * @param fullPath the full path of the folder within the workspace (never <code>null</code>) * @throws Exception if there is a problem creating the folder node - * @since 0.6 */ public FolderNode( Workspace workspace, String fullPath ) throws Exception { @@ -81,7 +76,6 @@ /** * @return the full path of folder within the workspace - * @since 0.6 */ public String getPath() { return getId(); @@ -93,7 +87,6 @@ * The URL will NOT end in '/'. * * @see org.jboss.dna.web.jcr.rest.client.json.JsonNode#getUrl() - * @since 0.6 */ @Override public URL getUrl() throws Exception { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/IJsonConstants.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -26,67 +26,51 @@ /** * 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 { /** * The HTTP method to use when creating a connection with the REST server. - * - * @since 0.6 */ enum RequestMethod { /** * The HTTP DELETE request method. - * - * @since 0.6 */ DELETE, /** * The HTTP GET request method. - * - * @since 0.6 */ GET, /** * The HTTP POST request method. - * - * @since 0.6 */ POST, /** * The HTTP PUT request method. - * - * @since 0.6 */ PUT } /** * The key in the <code>JSONObject</code> whose value is the collection of node children. - * - * @since 0.6 */ String CHILDREN_KEY = "children"; //$NON-NLS-1$ /** * The key in the <code>JSONObject</code> whose value is the collection of node properties. - * - * @since 0.6 */ String PROPERTIES_KEY = "properties"; //$NON-NLS-1$ /** - * @since 0.6 + * The server context added to URLs. */ String SERVER_CONTEXT = "/resources"; //$NON-NLS-1$ /** - * @since 0.6 + * The workspace context added to the URLs. */ String WORKSPACE_CONTEXT = "/items"; //$NON-NLS-1$ 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonNode.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -30,8 +30,6 @@ /** * 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 { @@ -41,8 +39,6 @@ /** * The node identifier. - * - * @since 0.6 */ private final String id; @@ -52,7 +48,6 @@ /** * @param id the node identifier (never <code>null</code>) - * @since 0.6 */ protected JsonNode( String id ) { CheckArg.isNotNull(id, "id"); //$NON-NLS-1$ @@ -66,7 +61,6 @@ /** * @return the content that gets published * @throws Exception if there is a problem obtaining the node content - * @since 0.6 */ public byte[] getContent() throws Exception { return super.toString().getBytes(); @@ -74,7 +68,6 @@ /** * @return a unique identifier for this node - * @since 0.6 */ public String getId() { return this.id; @@ -83,7 +76,6 @@ /** * @return an HTTP URL representing this node * @throws Exception if there is a problem constructing the URL - * @since 0.6 */ public abstract URL getUrl() throws Exception; @@ -91,7 +83,6 @@ * {@inheritDoc} * * @see org.codehaus.jettison.json.JSONObject#toString() - * @since 0.6 */ @Override public String toString() { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClient.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -43,8 +43,6 @@ /** * 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 { @@ -54,8 +52,6 @@ /** * The logger. - * - * @since 0.6 */ private final Logger logger = Logger.getLogger(JsonRestClient.class); @@ -70,7 +66,6 @@ * @param path the path in the workspace to the folder where the file node is being created * @param file the file whose contents will be contained in the file node being created * @throws Exception if there is a problem creating the file - * @since 0.6 */ private void createFileNode( Workspace workspace, String path, @@ -107,7 +102,6 @@ * @param workspace the workspace where the folder node is being created * @param path the folder path in the workspace * @throws Exception if there is a problem creating the folder - * @since 0.6 */ private void createFolderNode( Workspace workspace, String path ) throws Exception { @@ -140,7 +134,6 @@ * @param workspace the workspace being checked * @param folderPath the path being checked * @throws Exception if there is a problem ensuring the folder exists - * @since 0.6 */ private void ensureFolderExists( Workspace workspace, String folderPath ) throws Exception { @@ -180,7 +173,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getRepositories(org.jboss.dna.web.jcr.rest.client.domain.Server) - * @since 0.6 */ public Collection<Repository> getRepositories( Server server ) throws Exception { CheckArg.isNotNull(server, "server"); //$NON-NLS-1$ @@ -211,7 +203,6 @@ * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getUrl(java.io.File, java.lang.String, * org.jboss.dna.web.jcr.rest.client.domain.Workspace) - * @since 0.6 */ public URL getUrl( File file, String path, @@ -232,7 +223,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getWorkspaces(org.jboss.dna.web.jcr.rest.client.domain.Repository) - * @since 0.6 */ public Collection<Workspace> getWorkspaces( Repository repository ) throws Exception { CheckArg.isNotNull(repository, "repository"); //$NON-NLS-1$ @@ -266,7 +256,6 @@ * @param method the request method * @return the open connection which <strong>MUST</strong> be disconnected * @throws Exception if there is a problem establishing the connection - * @since 0.6 */ private HttpURLConnection openConnection( Server server, URL url, @@ -296,7 +285,6 @@ * @param file the file whose workspace contents are being requested * @return the base 64 encoded file contents or <code>null</code> if file is not found * @throws Exception if there is a problem obtaining the contents - * @since 0.6 */ String getFileContents( Workspace workspace, String path, @@ -318,7 +306,6 @@ * @param url the path being checked (never <code>null</code>) * @return <code>true</code> if the path exists * @throws Exception if there is a problem checking the existence of the path - * @since 0.6 */ private boolean pathExists( Server server, URL url ) throws Exception { @@ -343,7 +330,6 @@ * @param file the file being checked (never <code>null</code>) * @return <code>true</code> if the file exists in the workspace at the specified path * @throws Exception if there is a problem checking the existence of the file - * @since 0.6 */ public boolean pathExists( Workspace workspace, String path, @@ -357,7 +343,6 @@ * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#publish(org.jboss.dna.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) - * @since 0.6 */ public Status publish( Workspace workspace, String path, @@ -391,7 +376,6 @@ * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#unpublish(org.jboss.dna.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) - * @since 0.6 */ public Status unpublish( Workspace workspace, String path, 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/JsonUtils.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -33,8 +33,6 @@ /** * The <code>JsonUtils</code> class provides utilities needed to work with the DNA REST server JSON API. - * - * @since 0.6 */ public final class JsonUtils { @@ -44,8 +42,6 @@ /** * The default character set being used. - * - * @since 0.6 */ private static final String DEFAULT_CHARSET = "UTF-8"; //$NON-NLS-1$ // TODO need to property drive charset @@ -57,7 +53,6 @@ * @param text the text being URL decoded (never <code>null</code>) * @return the decoded text * @throws UnsupportedEncodingException if the charset is not supported - * @since 0.6 */ public static String decode( String text ) throws UnsupportedEncodingException { CheckArg.isNotNull(text, "text"); //$NON-NLS-1$ @@ -70,7 +65,6 @@ * @param text the text being URL encoded (never <code>null</code>) * @return the decoded text * @throws UnsupportedEncodingException if the charset is not supported - * @since 0.6 */ public static String encode( String text ) throws UnsupportedEncodingException { CheckArg.isNotNull(text, "text"); //$NON-NLS-1$ @@ -91,7 +85,6 @@ * @param connection the connection whose input stream is going to be read from (never <code>null</code>) * @return the data read from the connection input stream (never <code>null</code>) * @throws IOException if there is a problem reading from the connection - * @since 0.6 */ public static String readInputStream( HttpURLConnection connection ) throws IOException { CheckArg.isNotNull(connection, "connection"); //$NON-NLS-1$ @@ -114,10 +107,9 @@ /** * Don't allow construction. - * - * @since 0.6 */ private JsonUtils() { // nothing to do } + } 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/RepositoryNode.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -35,8 +35,6 @@ /** * 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 { @@ -46,8 +44,6 @@ /** * The DNA repository. - * - * @since 0.6 */ private final Repository repository; @@ -57,7 +53,6 @@ /** * @param repository the DNA repository (never <code>null</code>) - * @since 0.6 */ public RepositoryNode( Repository repository ) { super(repository.getName()); @@ -74,7 +69,6 @@ * This URL can be used to obtain the workspaces contained in this repository. The URL will NOT end in '/'. * * @see org.jboss.dna.web.jcr.rest.client.json.JsonNode#getUrl() - * @since 0.6 */ @Override public URL getUrl() throws Exception { @@ -90,7 +84,6 @@ * @param jsonResponse the HTTP connection JSON response (never <code>null</code>) containing the workspaces * @return the workspaces for this repository (never <code>null</code>) * @throws Exception if there is a problem obtaining the workspaces - * @since 0.6 */ @SuppressWarnings( "unchecked" ) public Collection<Workspace> getWorkspaces( String jsonResponse ) throws Exception { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/ServerNode.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -36,8 +36,6 @@ /** * 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 { @@ -47,15 +45,11 @@ /** * The logger. - * - * @since 0.6 */ private final Logger logger = Logger.getLogger(ServerNode.class); /** * The server containing DNA repositories. - * - * @since 0.6 */ private final Server server; @@ -65,7 +59,6 @@ /** * @param server the server containing the repositories (never <code>null</code>) - * @since 0.6 */ public ServerNode( Server server ) { super(server.getName()); @@ -82,7 +75,6 @@ * The URL will NOT end in '/'. * * @see org.jboss.dna.web.jcr.rest.client.json.JsonNode#getUrl() - * @since 0.6 */ @Override public URL getUrl() throws Exception { @@ -103,7 +95,6 @@ /** * @return the URL to use when requesting the repositories (never <code>null</code>) * @throws Exception if there is a problem obtaining the repositories - * @since 0.6 */ public URL getFindRepositoriesUrl() throws Exception { return new URL(getUrl().toString() + '/'); @@ -113,7 +104,6 @@ * @param jsonResponse the HTTP connection JSON response (never <code>null</code>) containing the repositories * @return the repositories found in the JSON response (never <code>null</code>) * @throws Exception if there is a problem obtaining the repositories - * @since 0.6 */ @SuppressWarnings( "unchecked" ) public Collection<Repository> getRepositories( String jsonResponse ) throws Exception { 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/main/java/org/jboss/dna/web/jcr/rest/client/json/WorkspaceNode.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -29,8 +29,6 @@ /** * 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 { @@ -46,7 +44,6 @@ /** * @param workspace the repository workspace (never <code>null</code>) - * @since 0.6 */ public WorkspaceNode( Workspace workspace ) { super(workspace.getName()); @@ -61,7 +58,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.json.JsonNode#getUrl() - * @since 0.6 */ @Override public URL getUrl() throws Exception { Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/MockRestClient.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/MockRestClient.java 2009-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/MockRestClient.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -32,8 +32,6 @@ /** * The <code>MockRestExecutor</code> class is a test <code>IRestClient</code> implementation that does nothing. - * - * @since 0.6 */ public final class MockRestClient implements IRestClient { @@ -45,17 +43,16 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getRepositories(org.jboss.dna.web.jcr.rest.client.domain.Server) - * @since 0.6 */ public Collection<Repository> getRepositories( Server server ) throws Exception { return null; } - + /** * {@inheritDoc} - * - * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getUrl(java.io.File, java.lang.String, org.jboss.dna.web.jcr.rest.client.domain.Workspace) - * @since 0.6 + * + * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getUrl(java.io.File, java.lang.String, + * org.jboss.dna.web.jcr.rest.client.domain.Workspace) */ public URL getUrl( File file, String path, @@ -67,7 +64,6 @@ * {@inheritDoc} * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#getWorkspaces(org.jboss.dna.web.jcr.rest.client.domain.Repository) - * @since 0.6 */ public Collection<Workspace> getWorkspaces( Repository repository ) throws Exception { return null; @@ -78,7 +74,6 @@ * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#publish(org.jboss.dna.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) - * @since 0.6 */ public Status publish( Workspace workspace, String path, @@ -91,7 +86,6 @@ * * @see org.jboss.dna.web.jcr.rest.client.IRestClient#unpublish(org.jboss.dna.web.jcr.rest.client.domain.Workspace, * java.lang.String, java.io.File) - * @since 0.6 */ public Status unpublish( Workspace workspace, String path, Modified: branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/RestClientI18nTest.java =================================================================== --- branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/RestClientI18nTest.java 2009-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/RestClientI18nTest.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -26,10 +26,10 @@ import org.jboss.dna.common.AbstractI18nTest; /** - * @since 0.6 + * Test for the I18n file. */ public final class RestClientI18nTest extends AbstractI18nTest { - + public RestClientI18nTest() { super(RestClientI18n.class); } 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/ServerManagerTest.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -32,8 +32,6 @@ /** * 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/StatusTest.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -32,8 +32,6 @@ /** * 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/RepositoryTest.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -33,8 +33,6 @@ /** * 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/ServerTest.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -33,8 +33,6 @@ /** * 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/domain/WorkspaceTest.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -33,8 +33,6 @@ /** * 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-09-10 21:16:23 UTC (rev 1204) +++ branches/eclipse/dna-web-jcr-rest-client/src/test/java/org/jboss/dna/web/jcr/rest/client/json/JsonRestClientTest.java 2009-09-10 21:38:13 UTC (rev 1205) @@ -46,8 +46,6 @@ * One container: mvn -P cargo-1 clean install assembly:assembly * <p> * Two containers: mvn -P cargo-1,cargo-2 clean install assembly:assembly - * - * @since 0.6 */ public final class JsonRestClientTest {