DNA SVN: r1172 - in branches/eclipse/org.jboss.dna.publish.ui.swt: src/org/jboss/dna/web/jcr/rest/client/swt and 1 other directory.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-24 14:50:21 -0400 (Mon, 24 Aug 2009)
New Revision: 1172
Added:
branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/published_overlay.png
Removed:
branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/published_overlay.gif
Modified:
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java
Log:
A new "published" overlay image.
Deleted: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/published_overlay.gif
===================================================================
(Binary files differ)
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/published_overlay.png
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/published_overlay.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-24 17:01:51 UTC (rev 1171)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-24 18:50:21 UTC (rev 1172)
@@ -78,7 +78,7 @@
String PUBLISH_IMAGE = VIEWS_ICON_FOLDER + "publish.png"; //$NON-NLS-1$
- String PUBLISHED_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "published_overlay.gif"; //$NON-NLS-1$
+ String PUBLISHED_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "published_overlay.png"; //$NON-NLS-1$
String REFRESH_IMAGE = VIEWS_ICON_FOLDER + "refresh.gif"; //$NON-NLS-1$
16 years, 4 months
- 1
- 0
DNA SVN: r1171 - in branches/eclipse/org.jboss.dna.publish.ui.swt: icons/views and 3 other directories.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-24 13:01:51 -0400 (Mon, 24 Aug 2009)
New Revision: 1171
Added:
branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/published_overlay.gif
Modified:
branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java
Log:
Added a file image overlay decorator indicating if the file has been published to one or more DNA repositories. This overlay is removed by the decorator when the file is unpublished from all the DNA repositories it was published to. The published state of a file is persisted from session to session.
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/published_overlay.gif
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/published_overlay.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml 2009-08-21 22:08:39 UTC (rev 1170)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml 2009-08-24 17:01:51 UTC (rev 1171)
@@ -93,9 +93,14 @@
%decorator.description
</description>
<enablement>
+ <or>
<objectClass
name="org.jboss.dna.web.jcr.rest.client.domain.IDnaObject">
</objectClass>
+ <objectClass
+ name="org.eclipse.core.resources.IFile">
+ </objectClass>
+ </or>
</enablement>
</decorator>
</extension>
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-21 22:08:39 UTC (rev 1170)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-24 17:01:51 UTC (rev 1171)
@@ -78,6 +78,8 @@
String PUBLISH_IMAGE = VIEWS_ICON_FOLDER + "publish.png"; //$NON-NLS-1$
+ String PUBLISHED_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "published_overlay.gif"; //$NON-NLS-1$
+
String REFRESH_IMAGE = VIEWS_ICON_FOLDER + "refresh.gif"; //$NON-NLS-1$
String UNPUBLISH_IMAGE = VIEWS_ICON_FOLDER + "unpublish.png"; //$NON-NLS-1$
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java 2009-08-21 22:08:39 UTC (rev 1170)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java 2009-08-24 17:01:51 UTC (rev 1171)
@@ -55,6 +55,8 @@
public static I18n newServerActionText;
public static I18n newServerActionToolTip;
+ public static I18n publishedResourcePropertyErrorMsg;
+
public static I18n publishJobConsoleName;
public static I18n publishJobPublish;
public static I18n publishJobPublishCanceledMsg;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties 2009-08-21 22:08:39 UTC (rev 1170)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties 2009-08-24 17:01:51 UTC (rev 1171)
@@ -44,6 +44,8 @@
newServerActionText = New Server
newServerActionToolTip = Create a new server
+publishedResourcePropertyErrorMsg = Error obtaining the "published" property from the resource "{0}"
+
publishJobConsoleName = DNA
publishJobProblemCreatingHyperlinkMsg = Unexpected problem creating hyperlink in DNA Console view
publishJobPublish = [{0}] Publishing {4} file(s) to server "{1}" (repository "{2}", workspace "{3}") ...
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java 2009-08-21 22:08:39 UTC (rev 1170)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java 2009-08-24 17:01:51 UTC (rev 1171)
@@ -23,15 +23,23 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.ISharedImages;
+import org.jboss.dna.common.util.CheckArg;
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.Workspace;
/**
* @since 0.6
@@ -39,10 +47,71 @@
public final class Utils {
// ===========================================================================================================================
+ // Constants
+ // ===========================================================================================================================
+
+ /**
+ * Delimiter between a workspace's properties.
+ *
+ * @since 0.6
+ */
+ private static final String ID_DELIM = "$"; //$NON-NLS-1$
+
+ /**
+ * Delimiter between workspaces.
+ *
+ * @since 0.6
+ */
+ private static final String DELIM = "|"; //$NON-NLS-1$
+
+ /**
+ * The name of the persisted file property indicating if the resource has been published. This property will only exist if the
+ * file has been published to at least one DNA repository. The value of the property is a list of DNA repository workspaces
+ * where this file has been published.
+ *
+ * @since 0.6
+ */
+ private static QualifiedName PUBLISHED_RESOURCE_PROPERTY = new QualifiedName(IUiConstants.PLUGIN_ID, "publishedIn"); //$NON-NLS-1$
+
+ // ===========================================================================================================================
// Class Methods
// ===========================================================================================================================
/**
+ * @param file the file that was just published
+ * @param workspace the workspace where the file was published
+ * @since 0.6
+ */
+ public static void addPublishedProperty( IFile file,
+ Workspace workspace ) {
+ CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
+ CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$
+
+ String wsValue = createWorkspaceId(workspace);
+
+ try {
+ Set<String> workspaces = null;
+
+ // get current value
+ String value = file.getPersistentProperty(PUBLISHED_RESOURCE_PROPERTY);
+
+ if (value == null) {
+ workspaces = new HashSet<String>(1);
+ } else {
+ workspaces = parsePublishedPropertyValue(value);
+ }
+
+ workspaces.add(wsValue);
+
+ // set new value
+ value = createPublishedPropertyValue(workspaces);
+ file.setPersistentProperty(PUBLISHED_RESOURCE_PROPERTY, value);
+ } catch (CoreException e) {
+ Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishedResourcePropertyErrorMsg.text(file), e));
+ }
+ }
+
+ /**
* Sizes the shell to the minimum of it's current size or the width and height display percentages.
*
* @param shell the shell being resized (if necessary) and located
@@ -80,10 +149,10 @@
/**
* Converts the non-Eclipse status severity to an Eclipse severity level. An {@link Status.Severity#UNKNOWN unknown status} is
- * converted to {@link IStatus#CANCEL cancel}. A {@link Status.Severity} is
+ * converted to {@link IStatus#CANCEL cancel}.
*
* @param severity the eclipse status severity level
- * @return the converted severity level
+ * @return the converted severity level (never <code>null</code>)
* @see IStatus
* @since 0.6
*/
@@ -99,7 +168,7 @@
* Converts the Eclipse status severity level to a non-Eclipse severity.
*
* @param severity the eclipse status severity level
- * @return the converted severity level
+ * @return the converted severity level (never <code>null</code>)
* @see IStatus
* @since 0.6
*/
@@ -112,13 +181,43 @@
}
/**
+ * @param workspaces the workspaces used to create the property value
+ * @return the property value
+ * @since 0.6
+ */
+ private static String createPublishedPropertyValue( Set<String> workspaces ) {
+ StringBuilder value = new StringBuilder();
+
+ for (String workspace : workspaces) {
+ value.append(workspace).append(DELIM);
+ }
+
+ return value.toString();
+ }
+
+ /**
+ * @param workspace the workspace whose identifier is being created
+ * @return the ID
+ * @since 0.6
+ */
+ private static String createWorkspaceId( Workspace workspace ) {
+ StringBuilder result = new StringBuilder();
+ result.append(workspace.getServer().getUrl()).append(ID_DELIM).append(workspace.getServer().getUser()).append(ID_DELIM);
+ result.append(workspace.getRepository().getName()).append(ID_DELIM);
+ result.append(workspace.getName());
+
+ return result.toString();
+ }
+
+ /**
* The OK status does not have an image.
*
- * @param status the status whose image is being requested
+ * @param status the status whose image is being requested (never <code>null</code>)
* @return the image or <code>null</code> if no associated image for the status severity
* @since 0.6
*/
public static Image getImage( Status status ) {
+ CheckArg.isNotNull(status, "status"); //$NON-NLS-1$
String imageId = null;
if (status.isError()) {
@@ -139,11 +238,12 @@
/**
* The image can be used to decorate an existing image.
*
- * @param status the status whose image overlay is being requested
+ * @param status the status whose image overlay is being requested (never <code>null</code>)
* @return the image descriptor or <code>null</code> if none found for the status severity
* @since 0.6
*/
public static ImageDescriptor getOverlayImage( Status status ) {
+ CheckArg.isNotNull(status, "status"); //$NON-NLS-1$
String imageId = null;
if (status.isError()) {
@@ -157,6 +257,72 @@
return null;
}
+ /**
+ * @param file the file whose published status is being requested
+ * @return <code>true</code> if the file has been published to any DNA repository
+ * @since 0.6
+ */
+ public static boolean isPublished( IFile file ) {
+ CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
+
+ try {
+ return (file.getPersistentProperty(PUBLISHED_RESOURCE_PROPERTY) != null);
+ } catch (CoreException e) {
+ Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishedResourcePropertyErrorMsg.text(file), e));
+ }
+
+ return false;
+ }
+
+ /**
+ * @param value the property value being parsed
+ * @return a collection of workspace identifiers
+ * @since 0.6
+ */
+ private static Set<String> parsePublishedPropertyValue( String value ) {
+ StringTokenizer st = new StringTokenizer(value, DELIM);
+ Set<String> workspaces = new HashSet<String>(st.countTokens());
+
+ while (st.hasMoreTokens()) {
+ workspaces.add(st.nextToken());
+ }
+
+ return workspaces;
+ }
+
+ /**
+ * @param file the file that was just unpublished
+ * @param workspace the workspace where the file was unpublished
+ * @since 0.6
+ */
+ public static void removePublishedProperty( IFile file,
+ Workspace workspace ) {
+ CheckArg.isNotNull(file, "file"); //$NON-NLS-1$
+ CheckArg.isNotNull(workspace, "workspace"); //$NON-NLS-1$
+
+ String wsValue = createWorkspaceId(workspace);
+
+ try {
+ String value = file.getPersistentProperty(PUBLISHED_RESOURCE_PROPERTY);
+
+ if (value != null) {
+ Set<String> workspaces = parsePublishedPropertyValue(value);
+ workspaces.remove(wsValue);
+
+ if (workspaces.isEmpty()) {
+ // no other workspaces so remove property
+ file.setPersistentProperty(PUBLISHED_RESOURCE_PROPERTY, null);
+ } else {
+ // set new value
+ value = createPublishedPropertyValue(workspaces);
+ file.setPersistentProperty(PUBLISHED_RESOURCE_PROPERTY, value);
+ }
+ }
+ } catch (CoreException e) {
+ Activator.getDefault().log(new Status(Severity.ERROR, RestClientI18n.publishedResourcePropertyErrorMsg.text(file), e));
+ }
+ }
+
// ===========================================================================================================================
// Constructors
// ===========================================================================================================================
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java 2009-08-21 22:08:39 UTC (rev 1170)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java 2009-08-24 17:01:51 UTC (rev 1171)
@@ -23,6 +23,8 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.views;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PUBLISHED_OVERLAY_IMAGE;
+import org.eclipse.core.resources.IFile;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ColumnLabelProvider;
import org.eclipse.jface.viewers.IDecoration;
@@ -97,6 +99,7 @@
@Override
public void decorate( final Object element,
IDecoration decoration ) {
+ ImageDescriptor overlay = null;
final Display display = Display.getDefault();
if (display.isDisposed()) {
@@ -106,25 +109,26 @@
// must be an IDnaObject
if (element instanceof Server) {
Status status = Activator.getDefault().getServerManager().ping((Server)element);
+ overlay = Utils.getOverlayImage(status);
+ } else if (element instanceof IFile) {
+ if (Utils.isPublished((IFile)element)) {
+ overlay = Activator.getDefault().getImageDescriptor(PUBLISHED_OVERLAY_IMAGE);
+ }
+ }
- if (status.isError()) {
- ImageDescriptor overlay = Utils.getOverlayImage(status);
+ if (overlay != null) {
+ decoration.addOverlay(overlay);
+ }
- if (overlay != null) {
- decoration.addOverlay(overlay);
+ display.asyncExec(new Runnable() {
+ @SuppressWarnings( "synthetic-access" )
+ @Override
+ public void run() {
+ if (!display.isDisposed()) {
+ fireLabelProviderChanged(new LabelProviderChangedEvent(ServerContentProvider.this, element));
}
}
-
- display.asyncExec(new Runnable() {
- @SuppressWarnings( "synthetic-access" )
- @Override
- public void run() {
- if (!display.isDisposed()) {
- fireLabelProviderChanged(new LabelProviderChangedEvent(ServerContentProvider.this, element));
- }
- }
- });
- }
+ });
}
/**
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java 2009-08-21 22:08:39 UTC (rev 1170)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java 2009-08-24 17:01:51 UTC (rev 1171)
@@ -52,6 +52,7 @@
import org.jboss.dna.web.jcr.rest.client.domain.Workspace;
import org.jboss.dna.web.jcr.rest.client.swt.Activator;
import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
+import org.jboss.dna.web.jcr.rest.client.swt.Utils;
/**
* The <code>PublishJob</code> publishes or unpublishes one or more files using the {@link ServerManager}.
@@ -285,10 +286,20 @@
status = Activator.getDefault().getServerManager().publish(this.workspace,
eclipseFile.getFullPath().toString(),
file);
+
+ // set persistent property on resource indicating it has been published
+ if (!status.isError()) {
+ Utils.addPublishedProperty(eclipseFile, workspace);
+ }
} else {
status = Activator.getDefault().getServerManager().unpublish(this.workspace,
eclipseFile.getFullPath().toString(),
file);
+
+ // clear persistent property on resource indicating it has been unpublished
+ if (!status.isError()) {
+ Utils.removePublishedProperty(eclipseFile, workspace);
+ }
}
++numProcessed;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java 2009-08-21 22:08:39 UTC (rev 1170)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java 2009-08-24 17:01:51 UTC (rev 1171)
@@ -654,8 +654,13 @@
* @since 0.6
*/
void handleServerModified() {
- this.server = this.servers.get(this.cbxServer.getSelectionIndex());
+ int index = this.cbxServer.getSelectionIndex();
+ // make sure there is a selection
+ if (index != -1) {
+ this.server = this.servers.get(index);
+ }
+
// need to reload repositories since server changed
refreshRepositories();
@@ -799,6 +804,9 @@
this.server = null;
this.servers = new ArrayList<Server>(getServerManager().getServers());
+ // clear server combo
+ this.cbxServer.removeAll();
+
if (this.servers.size() == 0) {
// disable control if necessary
if (this.cbxServer.getEnabled()) {
16 years, 4 months
- 1
- 0
DNA SVN: r1170 - in branches/eclipse/org.jboss.dna.publish.ui.swt: src/org/jboss/dna/web/jcr/rest/client/swt and 1 other directories.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-21 18:08:39 -0400 (Fri, 21 Aug 2009)
New Revision: 1170
Modified:
branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java
Log:
Added hyperlinks to the DNA Message Console view. Hyperlinks now exist for each file that was published or unpublished. Clicking on the hyperlink opens the file in the default editor.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF 2009-08-19 16:26:03 UTC (rev 1169)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/META-INF/MANIFEST.MF 2009-08-21 22:08:39 UTC (rev 1170)
@@ -10,7 +10,8 @@
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.ui.console,
- org.eclipse.jface.text
+ org.eclipse.jface.text,
+ org.eclipse.debug.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: dna-web-jcr-rest-client-0.6-SNAPSHOT-jar-with-dependencies.jar,
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-19 16:26:03 UTC (rev 1169)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-21 22:08:39 UTC (rev 1170)
@@ -35,6 +35,13 @@
*/
String PLUGIN_ID = "org.jboss.dna.web.jcr.rest.client.swt"; //$NON-NLS-1$
+ /**
+ * The identifier and type of the DNA Message Console. This is where publishing and unpublishing operations are logged.
+ *
+ * @since 0.6
+ */
+ String DNA_CONSOLE_ID = "org.jboss.dna.web.jcr.rest.client.swt.views.DnaConsole"; //$NON-NLS-1$
+
String ICON_FOLDER = "icons/"; //$NON-NLS-1$
//
@@ -82,19 +89,30 @@
String WIZARD_ICONS_FOLDER = ICON_FOLDER + "wizards/"; //$NON-NLS-1$
String DNA_WIZARD_BANNER_IMAGE = WIZARD_ICONS_FOLDER + "dna_wizard_banner.gif"; //$NON-NLS-1$
-
+
//
// Help Contexts
//
-
+
String HELP_CONTEXT_PREFIX = PLUGIN_ID + '.';
-
+
String DNA_CONSOLE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "dnaConsoleHelpContext"; //$NON-NLS-1$
-
+
String PUBLISH_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "publishDialogHelpContext"; //$NON-NLS-1$
-
+
String SERVER_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverDialogHelpContext"; //$NON-NLS-1$
-
+
String SERVER_VIEW_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverViewHelpContext"; //$NON-NLS-1$
+ //
+ // Jobs
+ //
+
+ /**
+ * The <code>Job</code> framework job family for the DNA publishing and unpublishing operations.
+ *
+ * @since 0.6
+ */
+ String DNA_PUBLISHING_JOB_FAMILY = "dna.publishing.job.family"; //$NON-NLS-1$
+
}
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java 2009-08-19 16:26:03 UTC (rev 1169)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.java 2009-08-21 22:08:39 UTC (rev 1170)
@@ -55,9 +55,10 @@
public static I18n newServerActionText;
public static I18n newServerActionToolTip;
- public static I18n publishJobPublishCanceledMsg;
public static I18n publishJobConsoleName;
public static I18n publishJobPublish;
+ public static I18n publishJobPublishCanceledMsg;
+ public static I18n publishJobProblemCreatingHyperlinkMsg;
public static I18n publishJobPublishFile;
public static I18n publishJobPublishFileFailed;
public static I18n publishJobPublishFileInfo;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties 2009-08-19 16:26:03 UTC (rev 1169)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties 2009-08-21 22:08:39 UTC (rev 1170)
@@ -45,23 +45,24 @@
newServerActionToolTip = Create a new server
publishJobConsoleName = DNA
-publishJobPublish = Publishing {3} file(s) to server "{0}" (repository "{1}", workspace "{2}") ...
-publishJobPublishCanceledMsg = i Publishing to server "{0}" (repository "{1}", workspace "{2}") was canceled after {3} file(s) out of {4} were processed.\n
-publishJobPublishFile = \t+ Published file "{0}" to location "{1}"
-publishJobPublishFileFailed = \t* ERROR publishing file "{0}" to location "{1}"
-publishJobPublishFileInfo = \ti {0}
-publishJobPublishFileWarning = \tw {0}
-publishJobPublishFinishedMsg = Done publishing ({3} milliseconds) to server "{0}" (repository "{1}", workspace "{2}").\n
-publishJobPublishName = DNA Publish
+publishJobProblemCreatingHyperlinkMsg = Unexpected problem creating hyperlink in DNA Console view
+publishJobPublish = [{0}] Publishing {4} file(s) to server "{1}" (repository "{2}", workspace "{3}") ...
+publishJobPublishCanceledMsg = [{0}] ! Publishing to server "{1}" (repository "{2}", workspace "{3}") was canceled after {4} file(s) out of {5} were processed.\n
+publishJobPublishFile = \t[{0}] + Published file "{1}"
+publishJobPublishFileFailed = \t[{0}] * Publishing file "{1}" generated an ERROR message. See log.
+publishJobPublishFileInfo = \t[{0}] i Publishing file "{1}" generated an INFO message. See log.
+publishJobPublishFileWarning = \t[{0}] w Publishing file "{1}" generated a WARNING message. See log.
+publishJobPublishFinishedMsg = [{0}] Done publishing ({4} milliseconds) to server "{1}" (repository "{2}", workspace "{3}").\n
+publishJobPublishName = DNA Publish
publishJobPublishTaskName = Publishing resources
publishJobUnexpectedErrorMsg = Unexpected error occurred. See log for more details.
-publishJobUnpublish = Unpublishing {3} file(s) from server "{0}" (repository "{1}", workspace "{2}") ...
-publishJobUnpublishCanceledMsg = * Unpublishing from server "{0}" (repository "{1}", workspace "{2}") was canceled after {3} file(s) out of {4} were processed.\n
-publishJobUnpublishFile = \t- Unpublished file "{0}" from location "{1}"
-publishJobUnpublishFileFailed = \t* ERROR unpublished file "{0}" from location "{1}"
-publishJobUnpublishFileInfo = \ti {0}
-publishJobUnpublishFileWarning = \tw {0}
-publishJobUnpublishFinishedMsg = Done unpublishing ({3} milliseconds) from server "{0}" (repository "{1}", workspace "{2}").\n
+publishJobUnpublish = [{0}] Unpublishing {4} file(s) from server "{1}" (repository "{2}", workspace "{3}") ...
+publishJobUnpublishCanceledMsg = [{0}] ! Unpublishing from server "{1}" (repository "{2}", workspace "{3}") was canceled after {4} file(s) out of {5} were processed.\n
+publishJobUnpublishFile = \t[{0}] - Unpublished file "{1}"
+publishJobUnpublishFileFailed = \t[{0}] * Unpublishing file "{0}" generated an ERROR message. See log.
+publishJobUnpublishFileInfo = \t[{0}] i Unpublishing file "{1}" generated an INFO message. See log.
+publishJobUnpublishFileWarning = \t[{0}] w Unpublishing file "{1}" generated a WARNING message. See log.
+publishJobUnpublishFinishedMsg = [{0}] Done unpublishing ({4} milliseconds) from server "{1}" (repository "{2}", workspace "{3}").\n
publishJobUnpublishName = DNA Unpublish
publishJobUnpublishTaskName = Unpublishing resources
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java 2009-08-19 16:26:03 UTC (rev 1169)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java 2009-08-21 22:08:39 UTC (rev 1170)
@@ -23,13 +23,23 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.wizards;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_CONSOLE_ID;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_PUBLISHING_JOB_FAMILY;
import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PLUGIN_ID;
import java.io.File;
import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.debug.ui.console.FileLink;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentListener;
+import org.eclipse.jface.text.IRegion;
import org.eclipse.ui.console.ConsolePlugin;
import org.eclipse.ui.console.IConsole;
import org.eclipse.ui.console.IConsoleManager;
@@ -38,6 +48,7 @@
import org.jboss.dna.common.util.CheckArg;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
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.Workspace;
import org.jboss.dna.web.jcr.rest.client.swt.Activator;
import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
@@ -81,6 +92,13 @@
*/
static final String CONSOLE_NAME = RestClientI18n.publishJobConsoleName.text();
+ /**
+ * A unique job identifier given to each publishing/unpublishing job.
+ *
+ * @since 0.6
+ */
+ private static final AtomicInteger JOB_ID = new AtomicInteger(1);
+
// ===========================================================================================================================
// Class Methods
// ===========================================================================================================================
@@ -155,6 +173,45 @@
// ===========================================================================================================================
/**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.core.runtime.jobs.Job#belongsTo(java.lang.Object)
+ * @since 0.6
+ */
+ @Override
+ public boolean belongsTo( Object family ) {
+ return DNA_PUBLISHING_JOB_FAMILY.equals(family);
+ }
+
+ /**
+ * Note: The <code>DnaConsole</code> should <strong>NOT</strong> be cached as the user can open/close/create instances.
+ *
+ * @return the DNA Message Console if available or a new one
+ * @since 0.6
+ */
+ private DnaConsole getDnaConsole() {
+ DnaConsole console = null;
+ IConsoleManager consoleMgr = ConsolePlugin.getDefault().getConsoleManager();
+ IConsole[] consoles = consoleMgr.getConsoles();
+
+ // see if DNA console already exists
+ for (int i = 0; i < consoles.length; ++i) {
+ if (CONSOLE_NAME.equals(consoles[i].getName())) {
+ console = (DnaConsole)consoles[i];
+ break;
+ }
+ }
+
+ // create DNA console if necessary
+ if (console == null) {
+ console = new DnaConsole();
+ consoleMgr.addConsoles(new IConsole[] {console});
+ }
+
+ return console;
+ }
+
+ /**
* @return <code>true</code> if a publishing job
* @since 0.6
*/
@@ -171,6 +228,7 @@
@Override
protected IStatus run( IProgressMonitor monitor ) {
assert (this.workspace != null);
+ int jobId = JOB_ID.getAndIncrement();
long startTime = System.currentTimeMillis();
try {
@@ -180,15 +238,17 @@
// write initial message to console
if (isPublishing()) {
- writeToConsole(RestClientI18n.publishJobPublish.text(this.workspace.getServer().getUrl(),
- this.workspace.getRepository().getName(),
- this.workspace.getName(),
- this.files.size()));
+ writeToConsole(getDnaConsole(), RestClientI18n.publishJobPublish.text(jobId,
+ this.workspace.getServer().getUrl(),
+ this.workspace.getRepository().getName(),
+ this.workspace.getName(),
+ this.files.size()));
} else {
- writeToConsole(RestClientI18n.publishJobUnpublish.text(this.workspace.getServer().getUrl(),
- this.workspace.getRepository().getName(),
- this.workspace.getName(),
- this.files.size()));
+ writeToConsole(getDnaConsole(), RestClientI18n.publishJobUnpublish.text(jobId,
+ this.workspace.getServer().getUrl(),
+ this.workspace.getRepository().getName(),
+ this.workspace.getName(),
+ this.files.size()));
}
// process the files
@@ -199,20 +259,22 @@
String msg = null;
if (isPublishing()) {
- msg = RestClientI18n.publishJobPublishCanceledMsg.text(this.workspace.getServer().getUrl(),
+ msg = RestClientI18n.publishJobPublishCanceledMsg.text(jobId,
+ this.workspace.getServer().getUrl(),
this.workspace.getRepository().getName(),
this.workspace.getName(),
numProcessed,
this.files.size());
} else {
- msg = RestClientI18n.publishJobUnpublishCanceledMsg.text(this.workspace.getServer().getUrl(),
+ msg = RestClientI18n.publishJobUnpublishCanceledMsg.text(jobId,
+ this.workspace.getServer().getUrl(),
this.workspace.getRepository().getName(),
this.workspace.getName(),
numProcessed,
this.files.size());
}
- writeToConsole(msg); // write cancel msg to console
+ writeToConsole(getDnaConsole(), msg); // write cancel msg to console
throw new InterruptedException(msg);
}
@@ -232,8 +294,8 @@
++numProcessed;
monitor.worked(1);
- // write success msg to console
- writeToConsole(file, eclipseFile.getParent().getFullPath().toString(), status);
+ // write outcome msg to console
+ writeToConsole(jobId, eclipseFile, status);
}
return org.eclipse.core.runtime.Status.OK_STATUS;
@@ -249,17 +311,22 @@
return new org.eclipse.core.runtime.Status(IStatus.ERROR, PLUGIN_ID, msg, e);
} finally {
monitor.done();
- // add done msg
+
+ // add operation done msg
// TODO need to format this duration better
long duration = System.currentTimeMillis() - startTime;
if (isPublishing()) {
- writeToConsole(RestClientI18n.publishJobPublishFinishedMsg.text(this.workspace.getServer().getUrl(),
+ writeToConsole(getDnaConsole(),
+ RestClientI18n.publishJobPublishFinishedMsg.text(jobId,
+ this.workspace.getServer().getUrl(),
this.workspace.getRepository().getName(),
this.workspace.getName(),
duration));
} else {
- writeToConsole(RestClientI18n.publishJobUnpublishFinishedMsg.text(this.workspace.getServer().getUrl(),
+ writeToConsole(getDnaConsole(),
+ RestClientI18n.publishJobUnpublishFinishedMsg.text(jobId,
+ this.workspace.getServer().getUrl(),
this.workspace.getRepository().getName(),
this.workspace.getName(),
duration));
@@ -268,69 +335,104 @@
}
/**
+ * @param jobId the job ID
* @param file the file involved in the publishing operation
- * @param workspacePath the path in the workspace where the file is located
* @param status the status of the publishing operation
* @since 0.6
*/
- private void writeToConsole( File file,
- String workspacePath,
+ private void writeToConsole( int jobId,
+ final IFile file,
Status status ) {
String msg = null;
if (status.isOk()) {
if (isPublishing()) {
- msg = RestClientI18n.publishJobPublishFile.text(file.getAbsolutePath(), workspacePath);
+ msg = RestClientI18n.publishJobPublishFile.text(jobId, file.getFullPath());
} else {
- msg = RestClientI18n.publishJobUnpublishFile.text(file.getAbsolutePath(), workspacePath);
+ msg = RestClientI18n.publishJobUnpublishFile.text(jobId, file.getFullPath());
}
} else if (status.isError()) {
if (isPublishing()) {
- msg = RestClientI18n.publishJobPublishFileFailed.text(file.getAbsolutePath(), workspacePath);
+ msg = RestClientI18n.publishJobPublishFileFailed.text(jobId, file.getFullPath());
} else {
- msg = RestClientI18n.publishJobUnpublishFileFailed.text(file.getAbsolutePath(), workspacePath);
+ msg = RestClientI18n.publishJobUnpublishFileFailed.text(jobId, file.getFullPath());
}
+
+ // log
+ Activator.getDefault().log(status);
} else if (status.isWarning()) {
if (isPublishing()) {
- msg = RestClientI18n.publishJobPublishFileWarning.text(status.getMessage());
+ msg = RestClientI18n.publishJobPublishFileWarning.text(jobId, file.getFullPath());
} else {
- msg = RestClientI18n.publishJobUnpublishFileWarning.text(status.getMessage());
+ msg = RestClientI18n.publishJobUnpublishFileWarning.text(jobId, file.getFullPath());
}
- } else if (status.isInfo()) {
+
+ // log
+ Activator.getDefault().log(status);
+ } else {
if (isPublishing()) {
- msg = RestClientI18n.publishJobPublishFileInfo.text(status.getMessage());
+ msg = RestClientI18n.publishJobPublishFileInfo.text(jobId, file.getFullPath());
} else {
- msg = RestClientI18n.publishJobUnpublishFileInfo.text(status.getMessage());
+ msg = RestClientI18n.publishJobUnpublishFileInfo.text(jobId, file.getFullPath());
}
+
+ // log
+ Activator.getDefault().log(status);
}
- // TODO create hyperlink in console for the file
- writeToConsole(msg);
+ // write to DNA Console
+ final DnaConsole dnaConsole = getDnaConsole();
+ final String consoleMsg = msg;
+ final IDocument doc = dnaConsole.getDocument();
+
+ // add listener that will add the hyperlink in the console for the file just published/unpublished
+ doc.addDocumentListener(new IDocumentListener() {
+ @Override
+ public void documentAboutToBeChanged( DocumentEvent event ) {
+ // nothing to do
+ }
+
+ @Override
+ public void documentChanged( DocumentEvent event ) {
+ try {
+ // add hyperlink to console
+ int startIndex = consoleMsg.indexOf('"');
+
+ if (startIndex != -1) {
+ ++startIndex; // move after the '""
+ int lastIndex = consoleMsg.lastIndexOf('"');
+
+ if (lastIndex != -1) {
+ --lastIndex; // move before the '"'
+ FindReplaceDocumentAdapter finder = new FindReplaceDocumentAdapter(doc);
+ IRegion region = finder.find(0, consoleMsg, true, true, false, false);
+
+ if (region != null) {
+ dnaConsole.addHyperlink(new FileLink(file, null, -1, -1, -1),
+ (region.getOffset() + startIndex),
+ (lastIndex - startIndex + 1));
+ doc.removeDocumentListener(this);
+ }
+ }
+ }
+ } catch (BadLocationException e) {
+ Activator.getDefault().log(new Status(Severity.ERROR,
+ RestClientI18n.publishJobProblemCreatingHyperlinkMsg.text(), e));
+ doc.removeDocumentListener(this);
+ }
+ }
+ });
+
+ writeToConsole(dnaConsole, msg);
}
/**
- * @param message the message being written to the DNA console
+ * @param console the DNA console being written to
+ * @param message the message being written
* @since 0.6
*/
- private void writeToConsole( String message ) {
- MessageConsole console = null;
- IConsoleManager consoleMgr = ConsolePlugin.getDefault().getConsoleManager();
- IConsole[] consoles = consoleMgr.getConsoles();
-
- // see if DNA console already exists
- for (int i = 0; i < consoles.length; ++i) {
- if (CONSOLE_NAME.equals(consoles[i].getName())) {
- console = (MessageConsole)consoles[i];
- break;
- }
- }
-
- // create DNA console if necessary
- if (console == null) {
- console = new DnaConsole();
- consoleMgr.addConsoles(new IConsole[] {console});
- }
-
+ private void writeToConsole( MessageConsole console,
+ String message ) {
// show and focus console view
console.activate();
@@ -345,10 +447,23 @@
class DnaConsole extends MessageConsole {
+ /**
+ * @since 0.6
+ */
public DnaConsole() {
super(CONSOLE_NAME, null);
}
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.ui.console.AbstractConsole#getType()
+ * @since 0.6
+ */
+ @Override
+ public String getType() {
+ return DNA_CONSOLE_ID;
+ }
}
}
16 years, 4 months
- 1
- 0
DNA SVN: r1169 - in branches/eclipse/org.jboss.dna.publish.ui.swt: docs and 6 other directories.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-19 12:26:03 -0400 (Wed, 19 Aug 2009)
New Revision: 1169
Added:
branches/eclipse/org.jboss.dna.publish.ui.swt/about.ini
branches/eclipse/org.jboss.dna.publish.ui.swt/about.mappings
branches/eclipse/org.jboss.dna.publish.ui.swt/about.properties
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaConsole.html
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaServerView.html
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaToc.html
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/PublishDialog.html
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ResourceContextMenu.html
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ServerDialog.html
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/helpContexts.xml
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/DnaConsole.png
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/PublishDialog.png
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ResourceDnaContextMenu.png
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ServerDialog.png
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ServerView.png
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/collapse_all.gif
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/delete_server.gif
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/edit_server.gif
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/new_server.gif
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/refresh.gif
branches/eclipse/org.jboss.dna.publish.ui.swt/docs/toc.xml
branches/eclipse/org.jboss.dna.publish.ui.swt/feature.png
branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/error_overlay.gif
Modified:
branches/eclipse/org.jboss.dna.publish.ui.swt/build.properties
branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.properties
branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java
Log:
Added first cut at dynamic help. Now feature shows up in About dialog. Added an image decorator that indicates when a server can't be connected to.
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/about.ini
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/about.ini (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/about.ini 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,21 @@
+# JBoss, Home of Professional Open Source.
+#
+# See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing.
+#
+# See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
+# about.ini
+# contains information about a feature
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# "%key" are externalized strings defined in about.properties
+# This file does not need to be translated.
+
+# Property "aboutText" contains blurb for "About" dialog (translated)
+aboutText=%featureText
+
+aboutImage=icons/views/dna_icon_16x.png
+
+# Property "featureImage" contains path to feature image (32x32)
+featureImage=feature.png
+
+# Property "appName" contains name of the application (translated)
+appName=%featureName
\ No newline at end of file
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/about.ini
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/about.mappings
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/about.mappings (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/about.mappings 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,3 @@
+#Thu Feb 26 11:28:46 CST 2009
+1=
+0=3126
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/about.properties
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/about.properties (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/about.properties 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,15 @@
+# JBoss, Home of Professional Open Source.
+#
+# See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing.
+#
+# See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
+
+featureText=DNA REST Client\n\
+Version: 1.0\n\
+\n\
+(c) 2000-2009 MetaMatrix, Inc. and Red Hat, Inc.\n\
+\n\
+Visit http://www.jboss.org/dna/
+
+featureName=DNA REST Client
+
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/about.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/build.properties
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/build.properties 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/build.properties 2009-08-19 16:26:03 UTC (rev 1169)
@@ -13,7 +13,13 @@
LEGAL.txt,\
AUTHORS.txt,\
dna-web-jcr-rest-client-0.6-SNAPSHOT-jar-with-dependencies.jar,\
- src/log4j.properties
+ src/log4j.properties,\
+ docs/helpContexts.xml,\
+ docs/,\
+ about.ini,\
+ about.mappings,\
+ about.properties,\
+ feature.png
src.includes = src/,\
LEGAL.txt
source.dnaPublishUi.jar = src/
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaConsole.html
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaConsole.html (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaConsole.html 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,35 @@
+<h2>DNA Console</h2>
+
+<p>The DNA Console is shown in the Workbench Console view. Entries in this view show the output of the publishing or unpublishing operations. For each operation there is an entry at the start of the operation and another entry at the end of the operation. Inbetween those entries will be an entry for each file involved in the operation.</p>
+
+<p>The following symbols indicate the type of outcome for each file:</p>
+
+<table border="1">
+<tr>
+ <td align="center"><strong>+</strong> </td>
+ <td>if the file was successfully published (uploaded)</td>
+</tr>
+<tr>
+ <td align="center"><strong>-</strong> </td>
+ <td>if the file was successfully unpublished (removed)</td>
+</tr>
+<tr>
+ <td align="center"><strong>*</strong> </td>
+ <td>if there was an error publishing or unpublishing the file</td>
+</tr>
+<tr>
+ <td align="center"><strong>w</strong> </td>
+ <td>if there is a warning when publishing or unpublishing a file (like trying to unpublish a file that was never unpublished)</td>
+</tr>
+</table>
+
+<p>Here is what the DNA Console in the Console view looks like:</p>
+
+<img src="images/DnaConsole.png" width="610" height="168" border="0" alt="">
+
+<p>There are view toolbar buttons to clear the console, scroll lock, pin the console, display a different console, and to open another DNA Console.</p>
+<h3>Related Topics</h3>
+
+<ul>
+<li><a href="PublishDialog.html">Publishing and Unpublishing Dialog</a></li>
+</ul>
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaConsole.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaServerView.html
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaServerView.html (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaServerView.html 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,15 @@
+<h2>Server View</h2>
+
+<p>The DNA Server View displays the registered servers hosting DNA repositories. For each server, the repositories and repository workspaces are also displayed. There are view toolbar buttons to create a new server (<img src="images/new_server.gif" width="16" height="16" border="0" alt="">), edit a selected server's properties (<img src="images/edit_server.gif" width="16" height="16" border="0" alt="">), delete one or more selected servers (<img src="images/delete_server.gif" width="16" height="16" border="0" alt="">), refresh, which attempts to connect to all the selected servers (<img src="images/refresh.gif" width="16" height="16" border="0" alt="">), and collapse all servers so that their repositories and workspaces can't be seen (<img src="images/collapse_all.gif" width="16" height="16" border="0" alt="">).</p>
+
+<p>Here is what the DNA Server View looks like:</p>
+
+<img src="images/ServerView.png" width="532" height="166" border="0" alt="">
+
+<p>If a connection to a server cannot be established that server icon will be decorated with an error overlay image. There is also a context menu with actions to create a new server (always enabled), edit server properties (enabled only when one server is selected), and delete one or more selected servers.</p>
+
+<h3>Related Topics</h3>
+
+<ul>
+<li><a href="ServerDialog.html">Server Dialog</a></li>
+</ul>
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaServerView.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaToc.html
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaToc.html (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaToc.html 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,9 @@
+<h2>DNA Publishing</h2>
+
+<ul>
+<li><a href="ResourceContextMenu.html">Resource Context Menu</a></li>
+<li><a href="PublishDialog.html">Publish/Unpublish Dialog</a></li>
+<li><a href="ServerDialog.html">Server Dialog</a></li>
+<li><a href="DnaServerView.html">Server View</a></li>
+<li><a href="DnaConsole.html">DNA Message Console</a></li>
+</ul>
\ No newline at end of file
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/DnaToc.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/PublishDialog.html
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/docs/PublishDialog.html (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/docs/PublishDialog.html 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,45 @@
+<h2>Publish/Unpublish Dialog</h2>
+
+<p>The DNA Publish/Unpublish Dialog is used to publish or unpublish workspace selected files and folders to/from DNA repository workspaces. When publishing, the selected files will be uploaded to the selected DNA repository workspace. When unpublishing, the selected files will be removed from the selected DNA repository workspace (if they exist there).</p>
+
+<p>The dialog consists of the following controls:</p>
+
+<table border="1">
+<tr>
+ <td align="right"><strong>Server Combo</strong> </td>
+ <td>allows selection of a registered server</td>
+</tr>
+<tr>
+ <td align="right"><strong>New Server Button</strong> </td>
+ <td>use to create and register a new server that is hosting a DNA repository</td>
+</tr>
+<tr>
+ <td align="right"><strong>Repository Combo</strong> </td>
+ <td>allows selection of a repository found hosted on the selected server</td>
+</tr>
+<tr>
+ <td align="right"><strong>Workspace Combo</strong> </td>
+ <td>allows selection of a workspace of the selected repository</td>
+</tr>
+<tr>
+ <td align="right"><strong>Resources List</strong> </td>
+ <td>a list of all the selected files that will be published or unpublished</td>
+</tr>
+<tr>
+ <td align="right"><strong>Recurse Checkbox</strong> </td>
+ <td>when checked will recursively select all files within any selected folders</td>
+</tr>
+</table>
+
+<p>Here is what the DNA Publish/Unpublish Dialog looks like:</p>
+
+<img src="images/PublishDialog.png" width="525" height="405" border="0" alt="">
+
+<p>A server must be selected before a repository can be selected. Likewise, a repository must be selected before a workspace can be selected. The message area at the top of the dialog will indicate the type of operation (publish or unpublish) and if there is any missing information. Once the workspace has been selected the 'Finish' button will be enabled and the operation can be executed. These operations can be run in the background so that multiple operations can be run at the same time. The DNA Message Console displays output from the operations.</p>
+
+<h3>Related Topics</h3>
+
+<ul>
+<li><a href="ServerDialog.html">Server Dialog</a></li>
+<li><a href="DnaConsole.html">DNA Message Console</a></li>
+</ul>
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/PublishDialog.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ResourceContextMenu.html
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ResourceContextMenu.html (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ResourceContextMenu.html 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,13 @@
+<h2>Resource Context Menu</h2>
+
+<p>The Resource Context Menu consists of two actions: publish and unpublish. Each action will be enabled when one or more resources (i.e, project, folder, or file) in the workspace are selected. When publishing, the selected resources will be uploaded to a DNA repository workspace. When unpublishing, the selected resources will be removed from a selected DNA repository workspace (if they exist there).</p>
+
+<p>Here is what the Resource Context Menu looks like:</p>
+
+<img src="images/ResourceDnaContextMenu.png" width="358" height="118" border="0" alt="">
+
+<h3>Related Topics</h3>
+
+<ul>
+<li><a href="PublishDialog.html">Publishing and Unpublishing Dialog</a></li>
+</ul>
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ResourceContextMenu.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ServerDialog.html
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ServerDialog.html (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ServerDialog.html 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,41 @@
+<h2>Server Dialog</h2>
+
+<p>The DNA Server Dialog is used to create and register new servers that host DNA repositories. This dialog is also used to edit an existing server's properties.</p>
+
+<p>The dialog consists of the following controls:</p>
+
+<table border="1">
+<tr>
+ <td align="right"><strong>URL Field</strong> </td>
+ <td>enter the server URL where one or more DNA repositories are hosted</td>
+</tr>
+<tr>
+ <td align="right"><strong>User Field</strong> </td>
+ <td>enter the name of the user that will be used when logging in to the server</td>
+</tr>
+<tr>
+ <td align="right"><strong>Password Field</strong> </td>
+ <td>enter the password to use when logging in to the server</td>
+</tr>
+<tr>
+ <td align="right"><strong>Save Password Checkbox</strong> </td>
+ <td>when checked the password will be saved in clear-text on the local machined</td>
+</tr>
+<tr>
+ <td align="right"><strong>Test Server Connection Button</strong> </td>
+ <td>when clicked will try and connect to the server</td>
+</tr>
+</table>
+
+<p>Here is what the DNA Server Dialog looks like:</p>
+
+<img src="images/ServerDialog.png" width="525" height="515" border="0" alt="">
+
+<p>Once all server properties have been entered the 'Finish' button will be enabled and the new server can be created or the existing server's properties can be modified. You can display the Server Dialog from the Server View and from the Publish/Unpublish Dialog.</p>
+
+<h3>Related Topics</h3>
+
+<ul>
+<li><a href="DnaServerView.html">Server View</a></li>
+<li><a href="PublishDialog.html">Publishing and Unpublishing Dialog</a></li>
+</ul>
\ No newline at end of file
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/ServerDialog.html
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/helpContexts.xml
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/docs/helpContexts.xml (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/docs/helpContexts.xml 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,27 @@
+<!--
+ JBoss, Home of Professional Open Source.
+
+ See the LEGAL.txt file distributed with this work for information regarding copyright ownership and licensing.
+
+ See the AUTHORS.txt file distributed with this work for a full listing of individual contributors.
+-->
+<contexts>
+ <context id="serverViewHelpContext" title="DNA Server View">
+ <description>Ther DNA Server View shows all registered servers and their repositories and workspaces.</description>
+ <topic href="docs/DnaServerView.html" label="DNA Server View"/>
+ <topic href="docs/ServerDialog.html" label="Server Dialog"/>
+ </context>
+ <context id="serverDialogHelpContext" title="Server Dialog">
+ <description>The DNA Server Dialog allows you to edit or create a server that hosts one or more DNA repositories.</description>
+ <topic href="docs/ServerDialog.html" label="Server Dialog"/>
+ </context>
+ <context id="publishDialogHelpContext" title="DNA Publish and Unpublish Dialog Help">
+ <description>The DNA Publish/Unpublish Dialog uploads or removes selected resources from a selected DNA server.</description>
+ <topic href="docs/PublishDialog.html" label="Publish/Unpublish Dialog"/>
+ <topic href="docs/ServerDialog.html" label="Create a new server"/>
+ </context>
+ <context id="dnaConsoleHelpContext" title="DNA Message Console">
+ <description>The DNA Message Console contains the output from the publishing and unpublishing operations.</description>
+ <topic href="docs/DnaConsole.html" label="DNA Message Console"/>
+ </context>
+</contexts>
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/helpContexts.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/DnaConsole.png
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/DnaConsole.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/PublishDialog.png
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/PublishDialog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ResourceDnaContextMenu.png
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ResourceDnaContextMenu.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ServerDialog.png
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ServerDialog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ServerView.png
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/ServerView.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/collapse_all.gif
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/collapse_all.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/delete_server.gif
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/delete_server.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/edit_server.gif
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/edit_server.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/new_server.gif
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/new_server.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/refresh.gif
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/images/refresh.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/toc.xml
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/docs/toc.xml (rev 0)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/docs/toc.xml 2009-08-19 16:26:03 UTC (rev 1169)
@@ -0,0 +1,7 @@
+<toc label="DNA Publishing">
+ <topic label="Publishing/Unpublishing Dialog" href="docs/PublishDialog.html"/>
+ <topic label="Server View" href="docs/DnaServerView.html"/>
+ <topic label="Server Dialog" href="docs/ServerDialog.html"/>
+ <topic label="DNA Console" href="docs/DnaConsole.html"/>
+ <topic label="Resource Context Menu" href="docs/ResourceContextMenu.html"/>
+</toc>
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/docs/toc.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/feature.png
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/feature.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/error_overlay.gif
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.publish.ui.swt/icons/views/error_overlay.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.properties
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.properties 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.properties 2009-08-19 16:26:03 UTC (rev 1169)
@@ -24,6 +24,8 @@
bundleName = DNA Eclipse Publishing UI Plug-in
bundleVendor = Red Hat, Inc.
contextMenu.label = DNA
+decorator.description = Decorates DNA objects in the Server View
+decorator.label = DNA Server View Decorator
dnaCategory = DNA
publishAction.label = Publish
serverView = DNA Servers
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/plugin.xml 2009-08-19 16:26:03 UTC (rev 1169)
@@ -78,4 +78,36 @@
</view>
</extension>
+<!-- Server view decorator -->
+ <extension
+ point="org.eclipse.ui.decorators">
+ <decorator
+ lightweight="true"
+ location="BOTTOM_LEFT"
+ adaptable="true"
+ label="%decorator.label"
+ state="true"
+ class="org.jboss.dna.web.jcr.rest.client.swt.views.ServerContentProvider"
+ id="dnaDecorator">
+ <description>
+ %decorator.description
+ </description>
+ <enablement>
+ <objectClass
+ name="org.jboss.dna.web.jcr.rest.client.domain.IDnaObject">
+ </objectClass>
+ </enablement>
+ </decorator>
+ </extension>
+
+<!-- Context Help -->
+ <extension point="org.eclipse.help.contexts">
+ <contexts file="docs/helpContexts.xml" />
+ </extension>
+
+<!-- Help Table of Contents -->
+ <extension point="org.eclipse.help.toc">
+ <toc file="docs/toc.xml" primary="true" />
+ </extension>
+
</plugin>
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Activator.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -163,11 +163,11 @@
String key = null;
if (object instanceof Workspace) {
- key = WORKSPACE_IMAGE_PATH;
+ key = WORKSPACE_IMAGE;
} else if (object instanceof Repository) {
- key = REPOSITORY_IMAGE_PATH;
+ key = REPOSITORY_IMAGE;
} else if (object instanceof Server) {
- key = SERVER_IMAGE_PATH;
+ key = SERVER_IMAGE;
} else if (object instanceof IDnaObject) {
// should have an icon for every business object
assert false;
@@ -205,11 +205,11 @@
String key = null;
if (object instanceof Workspace) {
- key = WORKSPACE_IMAGE_PATH;
+ key = WORKSPACE_IMAGE;
} else if (object instanceof Repository) {
- key = REPOSITORY_IMAGE_PATH;
+ key = REPOSITORY_IMAGE;
} else if (object instanceof Server) {
- key = SERVER_IMAGE_PATH;
+ key = SERVER_IMAGE;
} else if (object instanceof IDnaObject) {
// should have an icon for every business object
assert false;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/IUiConstants.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -35,50 +35,66 @@
*/
String PLUGIN_ID = "org.jboss.dna.web.jcr.rest.client.swt"; //$NON-NLS-1$
- String ICON_PATH = "icons/"; //$NON-NLS-1$
+ String ICON_FOLDER = "icons/"; //$NON-NLS-1$
//
// /icons/objects/
//
- String OBJECT_ICONS_FOLDER = ICON_PATH + "objects/"; //$NON-NLS-1$
+ String OBJECT_ICONS_FOLDER = ICON_FOLDER + "objects/"; //$NON-NLS-1$
- String CHECKMARK_IMAGE_PATH = OBJECT_ICONS_FOLDER + "checkmark.gif"; //$NON-NLS-1$
+ String CHECKMARK_IMAGE = OBJECT_ICONS_FOLDER + "checkmark.gif"; //$NON-NLS-1$
- String REPOSITORY_IMAGE_PATH = OBJECT_ICONS_FOLDER + "repository.gif"; //$NON-NLS-1$
+ String REPOSITORY_IMAGE = OBJECT_ICONS_FOLDER + "repository.gif"; //$NON-NLS-1$
- String SERVER_IMAGE_PATH = OBJECT_ICONS_FOLDER + "server.gif"; //$NON-NLS-1$
+ String SERVER_IMAGE = OBJECT_ICONS_FOLDER + "server.gif"; //$NON-NLS-1$
- String WORKSPACE_IMAGE_PATH = OBJECT_ICONS_FOLDER + "workspace.gif"; //$NON-NLS-1$
+ String WORKSPACE_IMAGE = OBJECT_ICONS_FOLDER + "workspace.gif"; //$NON-NLS-1$
//
// /icons/views/
//
- String VIEWS_ICON_FOLDER = ICON_PATH + "views/"; //$NON-NLS-1$
+ String VIEWS_ICON_FOLDER = ICON_FOLDER + "views/"; //$NON-NLS-1$
- String COLLAPSE_ALL_IMAGE_PATH = VIEWS_ICON_FOLDER + "collapse_all.gif"; //$NON-NLS-1$
+ String COLLAPSE_ALL_IMAGE = VIEWS_ICON_FOLDER + "collapse_all.gif"; //$NON-NLS-1$
- String DELETE_SERVER_IMAGE_PATH = VIEWS_ICON_FOLDER + "delete_server.gif"; //$NON-NLS-1$
+ String DELETE_SERVER_IMAGE = VIEWS_ICON_FOLDER + "delete_server.gif"; //$NON-NLS-1$
String DNA_IMAGE_16x = VIEWS_ICON_FOLDER + "dna_icon_16x.png"; //$NON-NLS-1$
- String EDIT_SERVER_IMAGE_PATH = VIEWS_ICON_FOLDER + "edit_server.gif"; //$NON-NLS-1$
+ String EDIT_SERVER_IMAGE = VIEWS_ICON_FOLDER + "edit_server.gif"; //$NON-NLS-1$
- String NEW_SERVER_IMAGE_PATH = VIEWS_ICON_FOLDER + "new_server.gif"; //$NON-NLS-1$
+ String ERROR_OVERLAY_IMAGE = VIEWS_ICON_FOLDER + "error_overlay.gif"; //$NON-NLS-1$
- String PUBLISH_IMAGE_PATH = VIEWS_ICON_FOLDER + "publish.png"; //$NON-NLS-1$
+ String NEW_SERVER_IMAGE = VIEWS_ICON_FOLDER + "new_server.gif"; //$NON-NLS-1$
- String REFRESH_IMAGE_PATH = VIEWS_ICON_FOLDER + "refresh.gif"; //$NON-NLS-1$
+ String PUBLISH_IMAGE = VIEWS_ICON_FOLDER + "publish.png"; //$NON-NLS-1$
- String UNPUBLISH_IMAGE_PATH = VIEWS_ICON_FOLDER + "unpublish.png"; //$NON-NLS-1$
+ String REFRESH_IMAGE = VIEWS_ICON_FOLDER + "refresh.gif"; //$NON-NLS-1$
+ String UNPUBLISH_IMAGE = VIEWS_ICON_FOLDER + "unpublish.png"; //$NON-NLS-1$
+
//
// /icons/wizards/
//
- String WIZARD_ICONS_FOLDER = ICON_PATH + "wizards/"; //$NON-NLS-1$
+ String WIZARD_ICONS_FOLDER = ICON_FOLDER + "wizards/"; //$NON-NLS-1$
- String DNA_WIZARD_BANNER_IMAGE_PATH = WIZARD_ICONS_FOLDER + "dna_wizard_banner.gif"; //$NON-NLS-1$
+ String DNA_WIZARD_BANNER_IMAGE = WIZARD_ICONS_FOLDER + "dna_wizard_banner.gif"; //$NON-NLS-1$
+
+ //
+ // Help Contexts
+ //
+
+ String HELP_CONTEXT_PREFIX = PLUGIN_ID + '.';
+
+ String DNA_CONSOLE_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "dnaConsoleHelpContext"; //$NON-NLS-1$
+
+ String PUBLISH_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "publishDialogHelpContext"; //$NON-NLS-1$
+
+ String SERVER_DIALOG_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverDialogHelpContext"; //$NON-NLS-1$
+
+ String SERVER_VIEW_HELP_CONTEXT = HELP_CONTEXT_PREFIX + "serverViewHelpContext"; //$NON-NLS-1$
}
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/Utils.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -24,6 +24,7 @@
package org.jboss.dna.web.jcr.rest.client.swt;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
@@ -135,6 +136,27 @@
return null;
}
+ /**
+ * The image can be used to decorate an existing image.
+ *
+ * @param status the status whose image overlay is being requested
+ * @return the image descriptor or <code>null</code> if none found for the status severity
+ * @since 0.6
+ */
+ public static ImageDescriptor getOverlayImage( Status status ) {
+ String imageId = null;
+
+ if (status.isError()) {
+ imageId = IUiConstants.ERROR_OVERLAY_IMAGE;
+ }
+
+ if (imageId != null) {
+ return Activator.getDefault().getImageDescriptor(imageId);
+ }
+
+ return null;
+ }
+
// ===========================================================================================================================
// Constructors
// ===========================================================================================================================
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/DeleteServerAction.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -23,7 +23,7 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.actions;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DELETE_SERVER_IMAGE_PATH;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DELETE_SERVER_IMAGE;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jface.dialogs.Dialog;
@@ -84,7 +84,7 @@
ServerManager serverManager ) {
super(RestClientI18n.deleteServerActionText.text());
setToolTipText(RestClientI18n.deleteServerActionToolTip.text());
- setImageDescriptor(Activator.getDefault().getImageDescriptor(DELETE_SERVER_IMAGE_PATH));
+ setImageDescriptor(Activator.getDefault().getImageDescriptor(DELETE_SERVER_IMAGE));
setEnabled(false);
this.serversToDelete = new ArrayList<Server>(5);
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/EditServerAction.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -24,7 +24,7 @@
package org.jboss.dna.web.jcr.rest.client.swt.actions;
import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.EDIT_SERVER_IMAGE_PATH;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.EDIT_SERVER_IMAGE;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Shell;
@@ -80,7 +80,7 @@
ServerManager serverManager ) {
super(RestClientI18n.editServerActionText.text());
setToolTipText(RestClientI18n.editServerActionToolTip.text());
- setImageDescriptor(Activator.getDefault().getImageDescriptor(EDIT_SERVER_IMAGE_PATH));
+ setImageDescriptor(Activator.getDefault().getImageDescriptor(EDIT_SERVER_IMAGE));
setEnabled(false);
this.shell = shell;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/actions/NewServerAction.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -24,7 +24,7 @@
package org.jboss.dna.web.jcr.rest.client.swt.actions;
import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_IMAGE_16x;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.NEW_SERVER_IMAGE_PATH;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.NEW_SERVER_IMAGE;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
@@ -72,7 +72,7 @@
ServerManager serverManager ) {
super(RestClientI18n.newServerActionText.text());
setToolTipText(RestClientI18n.newServerActionToolTip.text());
- setImageDescriptor(Activator.getDefault().getImageDescriptor(NEW_SERVER_IMAGE_PATH));
+ setImageDescriptor(Activator.getDefault().getImageDescriptor(NEW_SERVER_IMAGE));
this.shell = shell;
this.serverManager = serverManager;
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerContentProvider.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -23,12 +23,16 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.views;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.ColumnLabelProvider;
+import org.eclipse.jface.viewers.IDecoration;
import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ILightweightLabelDecorator;
import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProviderChangedEvent;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Display;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
import org.jboss.dna.web.jcr.rest.client.Status;
import org.jboss.dna.web.jcr.rest.client.Status.Severity;
@@ -38,13 +42,14 @@
import org.jboss.dna.web.jcr.rest.client.domain.Workspace;
import org.jboss.dna.web.jcr.rest.client.swt.Activator;
import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
+import org.jboss.dna.web.jcr.rest.client.swt.Utils;
/**
* The <code>ServerContentProvider</code> is a content and label provider for DNA repositories.
*
* @since 0.6
*/
-public final class ServerContentProvider extends ColumnLabelProvider implements ITreeContentProvider {
+public final class ServerContentProvider extends ColumnLabelProvider implements ILightweightLabelDecorator, ITreeContentProvider {
// ===========================================================================================================================
// Fields
@@ -57,23 +62,15 @@
*/
private final ServerManager serverManager;
- /**
- * The viewer using this content provider.
- *
- * @since 0.6
- */
- private Viewer viewer;
-
// ===========================================================================================================================
// Constructors
// ===========================================================================================================================
/**
- * @param serverManager the server manager being used to find servers, repositories, and workspaces
* @since 0.6
*/
- public ServerContentProvider( ServerManager serverManager ) {
- this.serverManager = serverManager;
+ public ServerContentProvider() {
+ this.serverManager = Activator.getDefault().getServerManager();
}
// ===========================================================================================================================
@@ -94,6 +91,45 @@
/**
* {@inheritDoc}
*
+ * @see org.eclipse.jface.viewers.ILightweightLabelDecorator#decorate(java.lang.Object, org.eclipse.jface.viewers.IDecoration)
+ * @since 0.6
+ */
+ @Override
+ public void decorate( final Object element,
+ IDecoration decoration ) {
+ final Display display = Display.getDefault();
+
+ if (display.isDisposed()) {
+ return;
+ }
+
+ // must be an IDnaObject
+ if (element instanceof Server) {
+ Status status = Activator.getDefault().getServerManager().ping((Server)element);
+
+ if (status.isError()) {
+ ImageDescriptor overlay = Utils.getOverlayImage(status);
+
+ if (overlay != null) {
+ decoration.addOverlay(overlay);
+ }
+ }
+
+ display.asyncExec(new Runnable() {
+ @SuppressWarnings( "synthetic-access" )
+ @Override
+ public void run() {
+ if (!display.isDisposed()) {
+ fireLabelProviderChanged(new LabelProviderChangedEvent(ServerContentProvider.this, element));
+ }
+ }
+ });
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
* @see org.eclipse.jface.viewers.IContentProvider#dispose()
* @since 0.6
*/
@@ -119,10 +155,6 @@
} catch (Exception e) {
String msg = RestClientI18n.serverManagerGetRepositoriesExceptionMsg.text(((Server)parentElement).getShortDescription());
Activator.getDefault().log(new Status(Severity.ERROR, msg, e));
-
- if (this.viewer.getControl().isVisible()) {
- MessageDialog.openError(this.viewer.getControl().getShell(), RestClientI18n.errorDialogTitle.text(), msg);
- }
}
try {
@@ -132,10 +164,6 @@
} catch (Exception e) {
String msg = RestClientI18n.serverManagerGetWorkspacesExceptionMsg.text();
Activator.getDefault().log(new Status(Severity.ERROR, msg, e));
-
- if (this.viewer.getControl().isVisible()) {
- MessageDialog.openError(this.viewer.getControl().getShell(), RestClientI18n.errorDialogTitle.text(), msg);
- }
}
return new Object[0];
@@ -256,7 +284,7 @@
public void inputChanged( Viewer viewer,
Object oldInput,
Object newInput ) {
- this.viewer = viewer;
+ // nothing to do
}
/**
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/views/ServerView.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -23,15 +23,18 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.views;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.COLLAPSE_ALL_IMAGE_PATH;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.REFRESH_IMAGE_PATH;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.COLLAPSE_ALL_IMAGE;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.REFRESH_IMAGE;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.SERVER_VIEW_HELP_CONTEXT;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.ColumnViewerToolTipSupport;
+import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.ILabelDecorator;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
@@ -41,6 +44,7 @@
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.actions.BaseSelectionListenerAction;
+import org.eclipse.ui.help.IWorkbenchHelpSystem;
import org.eclipse.ui.part.ViewPart;
import org.jboss.dna.web.jcr.rest.client.IServerRegistryListener;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
@@ -127,18 +131,24 @@
};
this.collapseAllAction.setToolTipText(RestClientI18n.collapseActionToolTip.text());
- this.collapseAllAction.setImageDescriptor(Activator.getDefault().getImageDescriptor(COLLAPSE_ALL_IMAGE_PATH));
+ this.collapseAllAction.setImageDescriptor(Activator.getDefault().getImageDescriptor(COLLAPSE_ALL_IMAGE));
// the refresh action is always enabled
this.refreshAction = new Action() {
@Override
public void run() {
- getViewer().refresh();
+ IStructuredSelection selection = (IStructuredSelection)getViewer().getSelection();
+
+ if (selection.size() == 1) {
+ getViewer().refresh(selection.getFirstElement());
+ } else {
+ getViewer().refresh();
+ }
}
};
this.refreshAction.setToolTipText(RestClientI18n.refreshActionToolTip.text());
- this.refreshAction.setImageDescriptor(Activator.getDefault().getImageDescriptor(REFRESH_IMAGE_PATH));
+ this.refreshAction.setImageDescriptor(Activator.getDefault().getImageDescriptor(REFRESH_IMAGE));
// the shell used for dialogs that the actions display
Shell shell = this.getSite().getShell();
@@ -188,11 +198,12 @@
* @since 0.6
*/
private void constructTreeViewer( Composite parent ) {
- this.provider = new ServerContentProvider(getServerManager());
+ this.provider = new ServerContentProvider();
this.viewer = new TreeViewer(parent, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI);
this.viewer.setContentProvider(this.provider);
- this.viewer.setLabelProvider(this.provider);
+ ILabelDecorator decorator = Activator.getDefault().getWorkbench().getDecoratorManager().getLabelDecorator();
+ this.viewer.setLabelProvider(new DecoratingLabelProvider(this.provider, decorator));
ColumnViewerToolTipSupport.enableFor(this.viewer);
this.viewer.addSelectionChangedListener(new ISelectionChangedListener() {
@@ -229,6 +240,10 @@
// register to receive changes to the server registry
getServerManager().addRegistryListener(this);
+
+ // register with the help system
+ IWorkbenchHelpSystem helpSystem = Activator.getDefault().getWorkbench().getHelpSystem();
+ helpSystem.setHelp(parent, SERVER_VIEW_HELP_CONTEXT);
}
/**
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishJob.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -23,6 +23,7 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.wizards;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PLUGIN_ID;
import java.io.File;
import java.util.List;
import org.eclipse.core.resources.IFile;
@@ -39,7 +40,6 @@
import org.jboss.dna.web.jcr.rest.client.Status;
import org.jboss.dna.web.jcr.rest.client.domain.Workspace;
import org.jboss.dna.web.jcr.rest.client.swt.Activator;
-import org.jboss.dna.web.jcr.rest.client.swt.IUiConstants;
import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
/**
@@ -79,7 +79,7 @@
*
* @since 0.6
*/
- private static final String CONSOLE_NAME = RestClientI18n.publishJobConsoleName.text();
+ static final String CONSOLE_NAME = RestClientI18n.publishJobConsoleName.text();
// ===========================================================================================================================
// Class Methods
@@ -246,7 +246,7 @@
msg = RestClientI18n.publishJobUnexpectedErrorMsg.text();
}
- return new org.eclipse.core.runtime.Status(IStatus.ERROR, IUiConstants.PLUGIN_ID, msg, e);
+ return new org.eclipse.core.runtime.Status(IStatus.ERROR, PLUGIN_ID, msg, e);
} finally {
monitor.done();
// add done msg
@@ -327,7 +327,7 @@
// create DNA console if necessary
if (console == null) {
- console = new MessageConsole(CONSOLE_NAME, null);
+ console = new DnaConsole();
consoleMgr.addConsoles(new IConsole[] {console});
}
@@ -339,4 +339,16 @@
out.println(message);
}
+ // ===========================================================================================================================
+ // Inner Class
+ // ===========================================================================================================================
+
+ class DnaConsole extends MessageConsole {
+
+ public DnaConsole() {
+ super(CONSOLE_NAME, null);
+ }
+
+ }
+
}
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishPage.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -23,6 +23,7 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.wizards;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.PUBLISH_DIALOG_HELP_CONTEXT;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -52,6 +53,7 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.help.IWorkbenchHelpSystem;
import org.jboss.dna.web.jcr.rest.client.IServerRegistryListener;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
import org.jboss.dna.web.jcr.rest.client.ServerRegistryEvent;
@@ -543,7 +545,11 @@
this.cbxRepository.addModifyListener(this);
this.cbxServer.addModifyListener(this);
this.cbxWorkspace.addModifyListener(this);
-
+
+ // register with the help system
+ IWorkbenchHelpSystem helpSystem = Activator.getDefault().getWorkbench().getHelpSystem();
+ helpSystem.setHelp(pnlMain, PUBLISH_DIALOG_HELP_CONTEXT);
+
// load the UI with data
refreshServers();
}
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/PublishWizard.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -23,7 +23,7 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.wizards;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WIZARD_BANNER_IMAGE_PATH;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WIZARD_BANNER_IMAGE;
import java.util.List;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
@@ -90,7 +90,7 @@
this.serverManager = serverManager;
setWindowTitle((type == Type.PUBLISH) ? RestClientI18n.publishWizardPublishTitle.text() : RestClientI18n.publishWizardUnpublishTitle.text());
- setDefaultPageImageDescriptor(Activator.getDefault().getImageDescriptor(DNA_WIZARD_BANNER_IMAGE_PATH));
+ setDefaultPageImageDescriptor(Activator.getDefault().getImageDescriptor(DNA_WIZARD_BANNER_IMAGE));
}
// ===========================================================================================================================
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerPage.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -23,6 +23,7 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.wizards;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.SERVER_DIALOG_HELP_CONTEXT;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.dialogs.MessageDialog;
@@ -43,10 +44,12 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.help.IWorkbenchHelpSystem;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
import org.jboss.dna.web.jcr.rest.client.Status;
import org.jboss.dna.web.jcr.rest.client.domain.Server;
import org.jboss.dna.web.jcr.rest.client.domain.validation.ServerValidator;
+import org.jboss.dna.web.jcr.rest.client.swt.Activator;
import org.jboss.dna.web.jcr.rest.client.swt.RestClientI18n;
/**
@@ -311,6 +314,10 @@
constructAuthenticationPanel(pnlMain);
constructTestConnectionPanel(pnlMain);
setControl(pnlMain);
+
+ // register with the help system
+ IWorkbenchHelpSystem helpSystem = Activator.getDefault().getWorkbench().getHelpSystem();
+ helpSystem.setHelp(pnlMain, SERVER_DIALOG_HELP_CONTEXT);
}
/**
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java 2009-08-19 16:07:34 UTC (rev 1168)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/wizards/ServerWizard.java 2009-08-19 16:26:03 UTC (rev 1169)
@@ -23,7 +23,7 @@
*/
package org.jboss.dna.web.jcr.rest.client.swt.wizards;
-import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WIZARD_BANNER_IMAGE_PATH;
+import static org.jboss.dna.web.jcr.rest.client.swt.IUiConstants.DNA_WIZARD_BANNER_IMAGE;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.Wizard;
import org.jboss.dna.web.jcr.rest.client.ServerManager;
@@ -76,7 +76,7 @@
this.page = new ServerPage();
this.serverManager = serverManager;
- setDefaultPageImageDescriptor(Activator.getDefault().getImageDescriptor(DNA_WIZARD_BANNER_IMAGE_PATH));
+ setDefaultPageImageDescriptor(Activator.getDefault().getImageDescriptor(DNA_WIZARD_BANNER_IMAGE));
setWindowTitle(RestClientI18n.serverWizardNewServerTitle.text());
}
16 years, 4 months
- 1
- 0
DNA SVN: r1168 - branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-19 12:07:34 -0400 (Wed, 19 Aug 2009)
New Revision: 1168
Added:
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/dnaRestClientUpdateSite.v20090819.zip
Log:
This is an update site archive that can be installed into Eclipse using the Update Manager.
Added: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/dnaRestClientUpdateSite.v20090819.zip
===================================================================
(Binary files differ)
Property changes on: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/dnaRestClientUpdateSite.v20090819.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 4 months
- 1
- 0
DNA SVN: r1167 - branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-19 11:55:10 -0400 (Wed, 19 Aug 2009)
New Revision: 1167
Removed:
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/artifacts.xml
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/content.xml
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/features/
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/plugins/
Log:
Deleting features and plugins directories as these are generated. Also the artifacts.xml and content.xml files have been deleted as these are also generated.
Deleted: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/artifacts.xml
===================================================================
--- branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/artifacts.xml 2009-08-19 15:49:59 UTC (rev 1166)
+++ branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/artifacts.xml 2009-08-19 15:55:10 UTC (rev 1167)
@@ -1,62 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?artifactRepository class='org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository' version='1.0.0'?>
-<repository name='JBoss DNA REST Eclipse SWT Client' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
- <properties size='2'>
- <property name='p2.compressed' value='false'/>
- <property name='p2.timestamp' value='1250277630246'/>
- </properties>
- <mappings size='3'>
- <rule filter='(& (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
- <rule filter='(& (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
- <rule filter='(& (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
- </mappings>
- <artifacts size='7'>
- <artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
- <properties size='3'>
- <property name='artifact.size' value='85068'/>
- <property name='download.size' value='85068'/>
- <property name='download.contentType' value='application/zip'/>
- </properties>
- </artifact>
- <artifact classifier='org.eclipse.update.feature' id='org.jboss.dna.web.jcr.rest.client.swt.feature' version='1.0.0.v20090708'>
- <properties size='2'>
- <property name='artifact.size' value='1859'/>
- <property name='download.size' value='1859'/>
- </properties>
- </artifact>
- <artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
- <properties size='3'>
- <property name='artifact.size' value='85010'/>
- <property name='download.size' value='85010'/>
- <property name='download.contentType' value='application/zip'/>
- </properties>
- </artifact>
- <artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
- <properties size='3'>
- <property name='artifact.size' value='9959017'/>
- <property name='download.size' value='9959017'/>
- <property name='download.contentType' value='application/zip'/>
- </properties>
- </artifact>
- <artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
- <properties size='3'>
- <property name='artifact.size' value='10911490'/>
- <property name='download.size' value='10911490'/>
- <property name='download.contentType' value='application/zip'/>
- </properties>
- </artifact>
- <artifact classifier='org.eclipse.update.feature' id='org.jboss.dna.web.jcr.rest.client.swt.feature' version='1.0.0.v20090708'>
- <properties size='2'>
- <property name='artifact.size' value='1848'/>
- <property name='download.size' value='1848'/>
- </properties>
- </artifact>
- <artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
- <properties size='3'>
- <property name='artifact.size' value='73732'/>
- <property name='download.size' value='73732'/>
- <property name='download.contentType' value='application/zip'/>
- </properties>
- </artifact>
- </artifacts>
-</repository>
Deleted: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/content.xml
===================================================================
--- branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/content.xml 2009-08-19 15:49:59 UTC (rev 1166)
+++ branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/content.xml 2009-08-19 15:55:10 UTC (rev 1167)
@@ -1,353 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<?metadataRepository class='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'?>
-<repository name='JBoss DNA REST Eclipse SWT Client' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
- <properties size='2'>
- <property name='p2.compressed' value='false'/>
- <property name='p2.timestamp' value='1250277630248'/>
- </properties>
- <units size='8'>
- <unit id='org.jboss.dna.web.jcr.rest.client.swt.feature.feature.jar' version='1.0.0.v20090708'>
- <update id='org.jboss.dna.web.jcr.rest.client.swt.feature.feature.jar' range='[0.0.0,1.0.0.v20090708)' severity='0'/>
- <properties size='9'>
- <property name='org.eclipse.equinox.p2.name' value='%featureName'/>
- <property name='org.eclipse.equinox.p2.description' value='%description'/>
- <property name='org.eclipse.equinox.p2.description.url' value='http://www.jboss.org/dna/'/>
- <property name='org.eclipse.equinox.p2.provider' value='%featureProvider'/>
- <property name='df_LT.featureName' value='JBoss DNA JCR REST Eclipse SWT Client'/>
- <property name='df_LT.copyright' value='JBoss DNA JCR REST Eclipse SWT Client (http://www.jboss.org/dna/) is copyright of Red Hat, Inc.'/>
- <property name='df_LT.featureProvider' value='Red Hat, Inc.'/>
- <property name='df_LT.description' value='The JBoss DNA JCR REST Eclipse Client provides a resource publishing and unpublishing capability to DNA repositories.'/>
- <property name='df_LT.license' value='This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is available at http://www.eclipse.org/legal/epl-v10.html.

Some portions may be licensed to Red Hat, Inc. under one or more contributor license agreements.'/>
- </properties>
- <provides size='4'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.dna.web.jcr.rest.client.swt.feature.feature.jar' version='1.0.0.v20090708'/>
- <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' version='1.0.0'/>
- <provided namespace='org.eclipse.update.feature' name='org.jboss.dna.web.jcr.rest.client.swt.feature' version='1.0.0.v20090708'/>
- <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
- </provides>
- <filter>
- (org.eclipse.update.install.features=true)
- </filter>
- <artifacts size='1'>
- <artifact classifier='org.eclipse.update.feature' id='org.jboss.dna.web.jcr.rest.client.swt.feature' version='1.0.0.v20090708'/>
- </artifacts>
- <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
- <touchpointData size='1'>
- <instructions size='1'>
- <instruction key='zipped'>
- true
- </instruction>
- </instructions>
- </touchpointData>
- <licenses size='1'>
- <license url='http://www.example.com/license'>
- %license
- </license>
- </licenses>
- <copyright url='http://www.example.com/copyright'>
- %copyright
- </copyright>
- </unit>
- <unit id='tooling.source.default' version='1.0.0' singleton='false'>
- <hostRequirements size='1'>
- <required namespace='org.eclipse.equinox.p2.eclipse.type' name='source' range='0.0.0' optional='true' multiple='true' greedy='false'/>
- </hostRequirements>
- <properties size='1'>
- <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
- </properties>
- <provides size='2'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='tooling.source.default' version='1.0.0'/>
- <provided namespace='org.eclipse.equinox.p2.flavor' name='tooling' version='1.0.0'/>
- </provides>
- <requires size='1'>
- <required namespace='org.eclipse.equinox.p2.eclipse.type' name='source' range='0.0.0' optional='true' multiple='true' greedy='false'/>
- </requires>
- <touchpoint id='null' version='0.0.0'/>
- <touchpointData size='1'>
- <instructions size='2'>
- <instruction key='install'>
- addSourceBundle(bundle:${artifact})
- </instruction>
- <instruction key='uninstall'>
- removeSourceBundle(bundle:${artifact})
- </instruction>
- </instructions>
- </touchpointData>
- </unit>
- <unit id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
- <update id='org.jboss.dna.web.jcr.rest.client.swt' range='[0.0.0,1.0.0)' severity='0'/>
- <properties size='4'>
- <property name='df_LT.bundleVendor' value='Red Hat, Inc.'/>
- <property name='df_LT.bundleName' value='DNA Eclipse Publishing UI Plug-in'/>
- <property name='org.eclipse.equinox.p2.name' value='%bundleName'/>
- <property name='org.eclipse.equinox.p2.provider' value='%bundleVendor'/>
- </properties>
- <provides size='4'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'/>
- <provided namespace='osgi.bundle' name='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'/>
- <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
- <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
- </provides>
- <requires size='3'>
- <required namespace='osgi.bundle' name='org.eclipse.ui' range='0.0.0'/>
- <required namespace='osgi.bundle' name='org.eclipse.core.runtime' range='0.0.0'/>
- <required namespace='osgi.bundle' name='org.eclipse.core.resources' range='0.0.0'/>
- </requires>
- <artifacts size='1'>
- <artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'/>
- </artifacts>
- <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
- <touchpointData size='1'>
- <instructions size='1'>
- <instruction key='manifest'>
- Bundle-ManifestVersion: 2
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,org.eclipse.core.runtime,org.eclipse.core.resources
Bundle-Activator: org.jboss.dna.web.jcr.rest.client.swt.Activator
Bundle-Name: %bundleName
Bundle-Version: 1.0.0
Bundle-Vendor: %bundleVendor
Bundle-SymbolicName: org.jboss.dna.web.jcr.rest.client.swt;singleton:=true
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: dna-web-jcr-rest-client-0.6-SNAPSHOT.jar,dnaPublishUi.jar
Manifest-Version: 1.0
- </instruction>
- </instructions>
- </touchpointData>
- </unit>
- <unit id='tooling.osgi.bundle.default' version='1.0.0' singleton='false'>
- <hostRequirements size='1'>
- <required namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' range='0.0.0' multiple='true' greedy='false'/>
- </hostRequirements>
- <properties size='1'>
- <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
- </properties>
- <provides size='2'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='tooling.osgi.bundle.default' version='1.0.0'/>
- <provided namespace='org.eclipse.equinox.p2.flavor' name='tooling' version='1.0.0'/>
- </provides>
- <requires size='1'>
- <required namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' range='0.0.0' multiple='true' greedy='false'/>
- </requires>
- <touchpoint id='null' version='0.0.0'/>
- <touchpointData size='1'>
- <instructions size='4'>
- <instruction key='install'>
- installBundle(bundle:${artifact})
- </instruction>
- <instruction key='uninstall'>
- uninstallBundle(bundle:${artifact})
- </instruction>
- <instruction key='unconfigure'>
-
- </instruction>
- <instruction key='configure'>
- setStartLevel(startLevel:4);
- </instruction>
- </instructions>
- </touchpointData>
- </unit>
- <unit id='tooling.org.eclipse.update.feature.default' version='1.0.0' singleton='false'>
- <hostRequirements size='1'>
- <required namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' range='0.0.0' optional='true' multiple='true' greedy='false'/>
- </hostRequirements>
- <properties size='1'>
- <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
- </properties>
- <provides size='2'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='tooling.org.eclipse.update.feature.default' version='1.0.0'/>
- <provided namespace='org.eclipse.equinox.p2.flavor' name='tooling' version='1.0.0'/>
- </provides>
- <requires size='1'>
- <required namespace='org.eclipse.equinox.p2.eclipse.type' name='feature' range='0.0.0' optional='true' multiple='true' greedy='false'/>
- </requires>
- <filter>
- (org.eclipse.update.install.features=true)
- </filter>
- <touchpoint id='null' version='0.0.0'/>
- <touchpointData size='1'>
- <instructions size='2'>
- <instruction key='install'>
- installFeature(feature:${artifact},featureId:default,featureVersion:default)
- </instruction>
- <instruction key='uninstall'>
- uninstallFeature(feature:${artifact},featureId:default,featureVersion:default)
- </instruction>
- </instructions>
- </touchpointData>
- </unit>
- <unit id='config.a.jre' version='1.6.0' singleton='false'>
- <hostRequirements size='1'>
- <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
- </hostRequirements>
- <properties size='1'>
- <property name='org.eclipse.equinox.p2.type.fragment' value='true'/>
- </properties>
- <provides size='1'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='config.a.jre' version='1.6.0'/>
- </provides>
- <requires size='1'>
- <required namespace='org.eclipse.equinox.p2.iu' name='a.jre' range='1.6.0'/>
- </requires>
- <touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
- <touchpointData size='1'>
- <instructions size='1'>
- <instruction key='install'>
-
- </instruction>
- </instructions>
- </touchpointData>
- </unit>
- <unit id='org.jboss.dna.web.jcr.rest.client.swt.feature.feature.group' version='1.0.0.v20090708' singleton='false'>
- <update id='org.jboss.dna.web.jcr.rest.client.swt.feature.feature.group' range='[0.0.0,1.0.0.v20090708)' severity='0'/>
- <properties size='10'>
- <property name='org.eclipse.equinox.p2.name' value='%featureName'/>
- <property name='org.eclipse.equinox.p2.description' value='%description'/>
- <property name='org.eclipse.equinox.p2.description.url' value='http://www.jboss.org/dna/'/>
- <property name='org.eclipse.equinox.p2.provider' value='%featureProvider'/>
- <property name='org.eclipse.equinox.p2.type.group' value='true'/>
- <property name='df_LT.featureName' value='JBoss DNA JCR REST Eclipse SWT Client'/>
- <property name='df_LT.copyright' value='JBoss DNA JCR REST Eclipse SWT Client (http://www.jboss.org/dna/) is copyright of Red Hat, Inc.'/>
- <property name='df_LT.featureProvider' value='Red Hat, Inc.'/>
- <property name='df_LT.description' value='The JBoss DNA JCR REST Eclipse Client provides a resource publishing and unpublishing capability to DNA repositories.'/>
- <property name='df_LT.license' value='This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which is available at http://www.eclipse.org/legal/epl-v10.html.

Some portions may be licensed to Red Hat, Inc. under one or more contributor license agreements.'/>
- </properties>
- <provides size='2'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='org.jboss.dna.web.jcr.rest.client.swt.feature.feature.group' version='1.0.0.v20090708'/>
- <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
- </provides>
- <requires size='5'>
- <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.ui' range='0.0.0'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.runtime' range='0.0.0'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.core.resources' range='0.0.0'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='org.jboss.dna.web.jcr.rest.client.swt' range='[1.0.0,1.0.0]'/>
- <required namespace='org.eclipse.equinox.p2.iu' name='org.jboss.dna.web.jcr.rest.client.swt.feature.feature.jar' range='[1.0.0.v20090708,1.0.0.v20090708]'>
- <filter>
- (org.eclipse.update.install.features=true)
- </filter>
- </required>
- </requires>
- <touchpoint id='null' version='0.0.0'/>
- <licenses size='1'>
- <license url='http://www.example.com/license'>
- %license
- </license>
- </licenses>
- <copyright url='http://www.example.com/copyright'>
- %copyright
- </copyright>
- </unit>
- <unit id='a.jre' version='1.6.0' singleton='false'>
- <provides size='117'>
- <provided namespace='org.eclipse.equinox.p2.iu' name='a.jre' version='1.6.0'/>
- <provided namespace='java.package' name='javax.accessibility' version='0.0.0'/>
- <provided namespace='java.package' name='javax.activity' version='0.0.0'/>
- <provided namespace='java.package' name='javax.crypto' version='0.0.0'/>
- <provided namespace='java.package' name='javax.crypto.interfaces' version='0.0.0'/>
- <provided namespace='java.package' name='javax.crypto.spec' version='0.0.0'/>
- <provided namespace='java.package' name='javax.imageio' version='0.0.0'/>
- <provided namespace='java.package' name='javax.imageio.event' version='0.0.0'/>
- <provided namespace='java.package' name='javax.imageio.metadata' version='0.0.0'/>
- <provided namespace='java.package' name='javax.imageio.plugins.bmp' version='0.0.0'/>
- <provided namespace='java.package' name='javax.imageio.plugins.jpeg' version='0.0.0'/>
- <provided namespace='java.package' name='javax.imageio.spi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.imageio.stream' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management.loading' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management.modelmbean' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management.monitor' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management.openmbean' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management.relation' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management.remote' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management.remote.rmi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.management.timer' version='0.0.0'/>
- <provided namespace='java.package' name='javax.naming' version='0.0.0'/>
- <provided namespace='java.package' name='javax.naming.directory' version='0.0.0'/>
- <provided namespace='java.package' name='javax.naming.event' version='0.0.0'/>
- <provided namespace='java.package' name='javax.naming.ldap' version='0.0.0'/>
- <provided namespace='java.package' name='javax.naming.spi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.net' version='0.0.0'/>
- <provided namespace='java.package' name='javax.net.ssl' version='0.0.0'/>
- <provided namespace='java.package' name='javax.print' version='0.0.0'/>
- <provided namespace='java.package' name='javax.print.attribute' version='0.0.0'/>
- <provided namespace='java.package' name='javax.print.attribute.standard' version='0.0.0'/>
- <provided namespace='java.package' name='javax.print.event' version='0.0.0'/>
- <provided namespace='java.package' name='javax.rmi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.rmi.CORBA' version='0.0.0'/>
- <provided namespace='java.package' name='javax.rmi.ssl' version='0.0.0'/>
- <provided namespace='java.package' name='javax.security.auth' version='0.0.0'/>
- <provided namespace='java.package' name='javax.security.auth.callback' version='0.0.0'/>
- <provided namespace='java.package' name='javax.security.auth.kerberos' version='0.0.0'/>
- <provided namespace='java.package' name='javax.security.auth.login' version='0.0.0'/>
- <provided namespace='java.package' name='javax.security.auth.spi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.security.auth.x500' version='0.0.0'/>
- <provided namespace='java.package' name='javax.security.cert' version='0.0.0'/>
- <provided namespace='java.package' name='javax.security.sasl' version='0.0.0'/>
- <provided namespace='java.package' name='javax.sound.midi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.sound.midi.spi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.sound.sampled' version='0.0.0'/>
- <provided namespace='java.package' name='javax.sound.sampled.spi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.sql' version='0.0.0'/>
- <provided namespace='java.package' name='javax.sql.rowset' version='0.0.0'/>
- <provided namespace='java.package' name='javax.sql.rowset.serial' version='0.0.0'/>
- <provided namespace='java.package' name='javax.sql.rowset.spi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.border' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.colorchooser' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.event' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.filechooser' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.plaf' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.plaf.basic' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.plaf.metal' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.plaf.multi' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.plaf.synth' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.table' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.text' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.text.html' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.text.html.parser' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.text.rtf' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.tree' version='0.0.0'/>
- <provided namespace='java.package' name='javax.swing.undo' version='0.0.0'/>
- <provided namespace='java.package' name='javax.transaction' version='0.0.0'/>
- <provided namespace='java.package' name='javax.transaction.xa' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.datatype' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.namespace' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.parsers' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.transform' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.transform.dom' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.transform.sax' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.transform.stream' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.validation' version='0.0.0'/>
- <provided namespace='java.package' name='javax.xml.xpath' version='0.0.0'/>
- <provided namespace='java.package' name='org.ietf.jgss' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CORBA' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CORBA_2_3' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CORBA_2_3.portable' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CORBA.DynAnyPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CORBA.ORBPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CORBA.portable' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CORBA.TypeCodePackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CosNaming' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CosNaming.NamingContextExtPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.CosNaming.NamingContextPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.Dynamic' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.DynamicAny' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.DynamicAny.DynAnyFactoryPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.DynamicAny.DynAnyPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.IOP' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.IOP.CodecFactoryPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.IOP.CodecPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.Messaging' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.PortableInterceptor' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.PortableInterceptor.ORBInitInfoPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.PortableServer' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.PortableServer.CurrentPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.PortableServer.POAManagerPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.PortableServer.POAPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.PortableServer.portable' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.PortableServer.ServantLocatorPackage' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.SendingContext' version='0.0.0'/>
- <provided namespace='java.package' name='org.omg.stub.java.rmi' version='0.0.0'/>
- <provided namespace='java.package' name='org.w3c.dom' version='0.0.0'/>
- <provided namespace='java.package' name='org.w3c.dom.bootstrap' version='0.0.0'/>
- <provided namespace='java.package' name='org.w3c.dom.events' version='0.0.0'/>
- <provided namespace='java.package' name='org.w3c.dom.ls' version='0.0.0'/>
- <provided namespace='java.package' name='org.xml.sax' version='0.0.0'/>
- <provided namespace='java.package' name='org.xml.sax.ext' version='0.0.0'/>
- <provided namespace='java.package' name='org.xml.sax.helpers' version='0.0.0'/>
- </provides>
- <touchpoint id='org.eclipse.equinox.p2.native' version='1.0.0'/>
- </unit>
- </units>
-</repository>
16 years, 4 months
- 1
- 0
DNA SVN: r1166 - branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-19 11:49:59 -0400 (Wed, 19 Aug 2009)
New Revision: 1166
Modified:
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/site.xml
Log:
Fixed problems with feature and feature image not showing up in About dialog. Tested update site archive in a new eclipse to make sure feature and help documents work.
Modified: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/site.xml
===================================================================
--- branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/site.xml 2009-08-19 15:49:30 UTC (rev 1165)
+++ branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/site.xml 2009-08-19 15:49:59 UTC (rev 1166)
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.jboss.dna.web.jcr.rest.client.swt.feature_1.0.0.v20090708.jar" id="org.jboss.dna.web.jcr.rest.client.swt.feature" version="1.0.0.v20090708"/>
+ <feature url="features/org.jboss.dna.web.jcr.rest.client.swt.feature_1.0.0.v20090819.jar" id="org.jboss.dna.web.jcr.rest.client.swt.feature" version="1.0.0.v20090819"/>
</site>
16 years, 4 months
- 1
- 0
DNA SVN: r1165 - branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-19 11:49:30 -0400 (Wed, 19 Aug 2009)
New Revision: 1165
Removed:
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/feature.png
Modified:
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/build.properties
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/feature.xml
Log:
Fixed problems with feature and feature image not showing up in About dialog. Tested update site archive in a new eclipse to make sure feature and help documents work.
Modified: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/build.properties
===================================================================
--- branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/build.properties 2009-08-14 19:51:48 UTC (rev 1164)
+++ branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/build.properties 2009-08-19 15:49:30 UTC (rev 1165)
@@ -1,5 +1,6 @@
bin.includes = feature.xml,\
feature.properties,\
LEGAL.txt,\
- AUTHORS.txt
+ AUTHORS.txt,\
+ feature.png
src.includes = LEGAL.txt
Deleted: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/feature.png
===================================================================
(Binary files differ)
Modified: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/feature.xml
===================================================================
--- branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/feature.xml 2009-08-14 19:51:48 UTC (rev 1164)
+++ branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.feature/feature.xml 2009-08-19 15:49:30 UTC (rev 1165)
@@ -2,9 +2,13 @@
<feature
id="org.jboss.dna.web.jcr.rest.client.swt.feature"
label="%featureName"
- version="1.0.0.v20090708"
- provider-name="%featureProvider">
+ version="1.0.0.v20090819"
+ image="feature.png"
+ provider-name="%featureProvider"
+ plugin="org.jboss.dna.web.jcr.rest.client.swt">
+<!-- NOTE: above image is found in the branding plugin -->
+
<description url="http://www.jboss.org/dna/">
%description
</description>
@@ -28,6 +32,6 @@
download-size="0"
install-size="0"
version="0.0.0"
- unpack="false"/>
+ unpack="true"/>
</feature>
16 years, 4 months
- 1
- 0
DNA SVN: r1164 - branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-14 15:51:48 -0400 (Fri, 14 Aug 2009)
New Revision: 1164
Modified:
branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties
Log:
Just added some formatting to some messages.
Modified: branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties
===================================================================
--- branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties 2009-08-14 19:28:37 UTC (rev 1163)
+++ branches/eclipse/org.jboss.dna.publish.ui.swt/src/org/jboss/dna/web/jcr/rest/client/swt/RestClientI18n.properties 2009-08-14 19:51:48 UTC (rev 1164)
@@ -46,22 +46,22 @@
publishJobConsoleName = DNA
publishJobPublish = Publishing {3} file(s) to server "{0}" (repository "{1}", workspace "{2}") ...
-publishJobPublishCanceledMsg = i Publishing to server "{0}" (repository "{1}", workspace "{2}") was canceled after {3} file(s) out of {4} were processed.
+publishJobPublishCanceledMsg = i Publishing to server "{0}" (repository "{1}", workspace "{2}") was canceled after {3} file(s) out of {4} were processed.\n
publishJobPublishFile = \t+ Published file "{0}" to location "{1}"
publishJobPublishFileFailed = \t* ERROR publishing file "{0}" to location "{1}"
publishJobPublishFileInfo = \ti {0}
publishJobPublishFileWarning = \tw {0}
-publishJobPublishFinishedMsg = Done publishing ({3} milliseconds) to server "{0}" (repository "{1}", workspace "{2}").
+publishJobPublishFinishedMsg = Done publishing ({3} milliseconds) to server "{0}" (repository "{1}", workspace "{2}").\n
publishJobPublishName = DNA Publish
publishJobPublishTaskName = Publishing resources
publishJobUnexpectedErrorMsg = Unexpected error occurred. See log for more details.
publishJobUnpublish = Unpublishing {3} file(s) from server "{0}" (repository "{1}", workspace "{2}") ...
-publishJobUnpublishCanceledMsg = * Unpublishing from server "{0}" (repository "{1}", workspace "{2}") was canceled after {3} file(s) out of {4} were processed.
+publishJobUnpublishCanceledMsg = * Unpublishing from server "{0}" (repository "{1}", workspace "{2}") was canceled after {3} file(s) out of {4} were processed.\n
publishJobUnpublishFile = \t- Unpublished file "{0}" from location "{1}"
publishJobUnpublishFileFailed = \t* ERROR unpublished file "{0}" from location "{1}"
publishJobUnpublishFileInfo = \ti {0}
publishJobUnpublishFileWarning = \tw {0}
-publishJobUnpublishFinishedMsg = Done unpublishing ({3} milliseconds) from server "{0}" (repository "{1}", workspace "{2}").
+publishJobUnpublishFinishedMsg = Done unpublishing ({3} milliseconds) from server "{0}" (repository "{1}", workspace "{2}").\n
publishJobUnpublishName = DNA Unpublish
publishJobUnpublishTaskName = Unpublishing resources
16 years, 4 months
- 1
- 0
DNA SVN: r1163 - in branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite: features and 1 other directories.
by dna-commits＠lists.jboss.org
Author: elvisisking
Date: 2009-08-14 15:28:37 -0400 (Fri, 14 Aug 2009)
New Revision: 1163
Modified:
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/artifacts.xml
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/content.xml
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/features/org.jboss.dna.web.jcr.rest.client.swt.feature_1.0.0.v20090708.jar
branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/plugins/org.jboss.dna.web.jcr.rest.client.swt_1.0.0.jar
Log:
Modified: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/artifacts.xml
===================================================================
--- branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/artifacts.xml 2009-08-14 19:19:06 UTC (rev 1162)
+++ branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/artifacts.xml 2009-08-14 19:28:37 UTC (rev 1163)
@@ -3,14 +3,14 @@
<repository name='JBoss DNA REST Eclipse SWT Client' type='org.eclipse.equinox.p2.artifact.repository.simpleRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='false'/>
- <property name='p2.timestamp' value='1248905146973'/>
+ <property name='p2.timestamp' value='1250277630246'/>
</properties>
<mappings size='3'>
<rule filter='(& (classifier=osgi.bundle))' output='${repoUrl}/plugins/${id}_${version}.jar'/>
<rule filter='(& (classifier=binary))' output='${repoUrl}/binary/${id}_${version}'/>
<rule filter='(& (classifier=org.eclipse.update.feature))' output='${repoUrl}/features/${id}_${version}.jar'/>
</mappings>
- <artifacts size='6'>
+ <artifacts size='7'>
<artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
<properties size='3'>
<property name='artifact.size' value='85068'/>
@@ -33,6 +33,13 @@
</artifact>
<artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
<properties size='3'>
+ <property name='artifact.size' value='9959017'/>
+ <property name='download.size' value='9959017'/>
+ <property name='download.contentType' value='application/zip'/>
+ </properties>
+ </artifact>
+ <artifact classifier='osgi.bundle' id='org.jboss.dna.web.jcr.rest.client.swt' version='1.0.0'>
+ <properties size='3'>
<property name='artifact.size' value='10911490'/>
<property name='download.size' value='10911490'/>
<property name='download.contentType' value='application/zip'/>
Modified: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/content.xml
===================================================================
--- branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/content.xml 2009-08-14 19:19:06 UTC (rev 1162)
+++ branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/content.xml 2009-08-14 19:28:37 UTC (rev 1163)
@@ -3,7 +3,7 @@
<repository name='JBoss DNA REST Eclipse SWT Client' type='org.eclipse.equinox.internal.p2.metadata.repository.LocalMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='false'/>
- <property name='p2.timestamp' value='1248905147025'/>
+ <property name='p2.timestamp' value='1250277630248'/>
</properties>
<units size='8'>
<unit id='org.jboss.dna.web.jcr.rest.client.swt.feature.feature.jar' version='1.0.0.v20090708'>
Modified: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/features/org.jboss.dna.web.jcr.rest.client.swt.feature_1.0.0.v20090708.jar
===================================================================
(Binary files differ)
Modified: branches/eclipse/org.jboss.dna.web.jcr.rest.client.swt.updatesite/plugins/org.jboss.dna.web.jcr.rest.client.swt_1.0.0.jar
===================================================================
(Binary files differ)
16 years, 4 months
- 1
- 0