gCubeSystem
/
resource-management-portlet
15
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

alpha release ready 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/resource-management@82348 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2013-10-03 09:46:35 +00:00
parent d52e489df2
commit 62ac87b86d
8 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/resource-management-5.0.2-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/resource-management-5.0.3-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -36,5 +36,5 @@
</classpathentry>
<classpathentry kind="lib" path="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="lib" path="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA.jar" sourcepath="/Applications/eclipse 4.3/plugins/com.google.gwt.eclipse.sdkbundle_2.5.1/gwt-2.5.1/validation-api-1.0.0.GA-sources.jar"/>
<classpathentry kind="output" path="target/resource-management-5.0.2-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/resource-management-5.0.3-SNAPSHOT/WEB-INF/classes"/>
</classpath>

2
.settings/com.google.gdt.eclipse.core.prefs
View File

@ -1,5 +1,5 @@
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.0.2-SNAPSHOT
lastWarOutDir=/Users/massi/Documents/workspace/resource-management/target/resource-management-5.0.3-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false

21
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.admin</groupId>
<artifactId>resource-management</artifactId>
<version>5.0.2-SNAPSHOT</version>
<version>5.0.3-SNAPSHOT</version>
<packaging>war</packaging>
<name>gCube Resource Management Portlet</name>
<description>
@ -67,7 +67,7 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<!-- <version>2.7.1</version> -->
<!-- <version>2.7.1</version> -->
</dependency>
<dependency>
<groupId>com.sencha.gxt</groupId>
@ -166,17 +166,22 @@
<artifactId>resource-sweeper-widget</artifactId>
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.gcube.portlets.admin</groupId> -->
<!-- <artifactId>software-upload-wizard</artifactId> -->
<!-- <version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
<!-- </dependency> -->
<dependency>
<groupId>org.gcube.portlets.admin</groupId>
<artifactId>software-upload-wizard</artifactId>
<version>[1.1.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.gcube.portlets.admin</groupId>
<artifactId>activation-record-widgets</artifactId>
<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
</dependency>
<!-- guice -->
<!-- guice guava-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>

35
src/main/java/org/gcube/portlets/admin/resourcemanagement/client/views/resourcedetails/ResourceDetailsPanel.java
View File

@ -25,6 +25,7 @@ import org.gcube.portlets.admin.resourcemanagement.client.utils.OpCommands;
import org.gcube.portlets.admin.resourcemanagement.client.widgets.console.ConsoleMessageBroker;
import org.gcube.portlets.admin.resourcemanagement.client.widgets.registry.UIIdentifiers;
import org.gcube.portlets.admin.resourcemanagement.client.widgets.registry.WidgetsRegistry;
import org.gcube.portlets.admin.software_upload_wizard.client.AppController;
//import org.gcube.portlets.admin.software_upload_wizard.client.AppController;
import org.gcube.resourcemanagement.support.client.utils.StatusHandler;
import org.gcube.resourcemanagement.support.client.views.ResourceTypeDecorator;
@ -323,24 +324,22 @@ public class ResourceDetailsPanel {
this.getToolBar().add(new SeparatorToolItem());
ToolButton doAddSoftware = new ToolButton("add-software-icon") {
protected void onClick(final ComponentEvent be) {
// super.onClick(be);
//
//
// GWT.runAsync(AppController.class, new RunAsyncCallback() {
// @Override
// public void onSuccess() {
// String currentScope = StatusHandler.getStatus().getCurrentScope();
// HandlerManager eventBus = new HandlerManager(null);
// AppController appViewer = new AppController(eventBus, currentScope);
// //AppController appViewer = new AppController(eventBus);
// appViewer.go();
// }
//
// public void onFailure(Throwable reason) {
// Window.alert("There are networks problem, please check your connection.");
// }
//
// });
super.onClick(be);
GWT.runAsync(AppController.class, new RunAsyncCallback() {
@Override
public void onSuccess() {
String currentScope = StatusHandler.getStatus().getCurrentScope();
HandlerManager eventBus = new HandlerManager(null);
AppController appViewer = new AppController(eventBus, currentScope);
//AppController appViewer = new AppController(eventBus);
appViewer.go();
}
public void onFailure(Throwable reason) {
Window.alert("There are networks problem, please check your connection.");
}
});
};
};

2
src/main/resources/org/gcube/portlets/admin/resourcemanagement/ResourceManagementPortlet.gwt.xml
View File

@ -8,7 +8,7 @@
<inherits name='com.extjs.gxt.ui.GXT' />
<inherits name='com.google.gwt.query.Query' />
<!-- inherits Software Uplad Widget -->
<!-- <inherits name='org.gcube.portlets.admin.software_upload_wizard.SoftwareUploadWizard' /> -->
<inherits name='org.gcube.portlets.admin.software_upload_wizard.SoftwareUploadWizard' />
<!-- inherits Resource Sweeper Widget -->
<inherits name='org.gcube.portlets.admin.resourcesweeper.Resource_sweeper' />

2
src/main/webapp/ResourceManagementPortlet.css
View File

@ -1,6 +1,6 @@
/* Comment import to style regular, uncomment if deploying on openbio or d4science.org */
/*@import url(openbio.css);*/
@import url(d4scienceOrg.css);
@import url(coherence.css);
/* Fix the scrollbar background style*/
.x-progress-text div {

22
src/main/webapp/WEB-INF/web.xml
View File

@ -28,17 +28,17 @@
<!-- SUW -->
<!-- <filter> -->
<!-- <filter-name>guiceFilter</filter-name> -->
<!-- <filter-class>com.google.inject.servlet.GuiceFilter</filter-class> -->
<!-- </filter> -->
<!-- <filter-mapping> -->
<!-- <filter-name>guiceFilter</filter-name> -->
<!-- <url-pattern>/*</url-pattern> -->
<!-- </filter-mapping> -->
<!-- <listener> -->
<!-- <listener-class>org.gcube.portlets.admin.software_upload_wizard.server.BootstrapListener</listener-class> -->
<!-- </listener> -->
<filter>
<filter-name>guiceFilter</filter-name>
<filter-class>com.google.inject.servlet.GuiceFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>guiceFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>org.gcube.portlets.admin.software_upload_wizard.server.BootstrapListener</listener-class>
</listener>
<!-- IS Health -->
<servlet>

0
src/main/webapp/d4scienceOrg.css → src/main/webapp/coherence.css
View File