You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2013/12/18 18:51:34 UTC
svn commit: r1552047 - in /airavata/trunk: ./
modules/distribution/xbaya-gui/src/main/assembly/ modules/xbaya-gui/
modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/
modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dial...
Author: chathuri
Date: Wed Dec 18 17:51:33 2013
New Revision: 1552047
URL: http://svn.apache.org/r1552047
Log:
removing GO file transfer window
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/xbaya-gui/pom.xml
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GlobusFileTransferWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/GlobusOnlineUtils.java
airavata/trunk/pom.xml
Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml?rev=1552047&r1=1552046&r2=1552047&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml Wed Dec 18 17:51:33 2013
@@ -1,4 +1,4 @@
-<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
+<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file
distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under
the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may
obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to
@@ -158,7 +158,7 @@
<include>com.google.guava:guava</include>
<include>org.apache.httpcomponents:httpcore:jar:4.3</include>
<include>org.apache.httpcomponents:httpclient:jar:4.3</include>
- <include>org.globusonline:transfer-api-client-java:jar:0.10.8-SNAPSHOT</include>
+ <!--<include>org.globusonline:transfer-api-client-java:jar:0.10.8</include>-->
<include>org.bouncycastle:bcprov-jdk16:jar:1.45</include>
<include>org.apache.thrift:libthrift:jar:0.9.1</include>
</includes>
Modified: airavata/trunk/modules/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1552047&r1=1552046&r2=1552047&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/pom.xml (original)
+++ airavata/trunk/modules/xbaya-gui/pom.xml Wed Dec 18 17:51:33 2013
@@ -315,11 +315,11 @@
<artifactId>derbyclient</artifactId>
<version>${derby.version}</version>
</dependency>
- <dependency>
- <groupId>org.globusonline</groupId>
- <artifactId>transfer-api-client-java</artifactId>
- <version>0.10.8-SNAPSHOT</version>
- </dependency>
+ <!--<dependency>-->
+ <!--<groupId>org.globusonline</groupId>-->
+ <!--<artifactId>transfer-api-client-java</artifactId>-->
+ <!--<version>0.10.8</version>-->
+ <!--</dependency>-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java?rev=1552047&r1=1552046&r2=1552047&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/menues/tools/ToolsMenuItem.java Wed Dec 18 17:51:33 2013
@@ -22,7 +22,7 @@
package org.apache.airavata.xbaya.menues.tools;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.dialogs.GlobusFileTransferWindow;
+//import org.apache.airavata.xbaya.ui.dialogs.GlobusFileTransferWindow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,28 +59,28 @@ public class ToolsMenuItem {
* Creates workflow menu.
*/
private void createWorkflowMenu() {
- JMenuItem globusFileTransferItem = createGlobusFileTransferItem();
- toolsMenu = new JMenu("Tools");
- toolsMenu.setMnemonic(KeyEvent.VK_T);
- toolsMenu.add(globusFileTransferItem);
+// JMenuItem globusFileTransferItem = createGlobusFileTransferItem();
+// toolsMenu = new JMenu("Tools");
+// toolsMenu.setMnemonic(KeyEvent.VK_T);
+// toolsMenu.add(globusFileTransferItem);
}
- private JMenuItem createGlobusFileTransferItem() {
- JMenuItem item = new JMenuItem("Globus File Transfer...");
- item.setMnemonic(KeyEvent.VK_J);
- item.addActionListener(new AbstractAction() {
- private GlobusFileTransferWindow window;
-
- public void actionPerformed(ActionEvent e) {
- if (this.window == null) {
- this.window = new GlobusFileTransferWindow(engine);
- }
- this.window.show();
- }
- });
- return item;
- }
+// private JMenuItem createGlobusFileTransferItem() {
+// JMenuItem item = new JMenuItem("Globus File Transfer...");
+// item.setMnemonic(KeyEvent.VK_J);
+// item.addActionListener(new AbstractAction() {
+// private GlobusFileTransferWindow window;
+//
+// public void actionPerformed(ActionEvent e) {
+// if (this.window == null) {
+// this.window = new GlobusFileTransferWindow(engine);
+// }
+// this.window.show();
+// }
+// });
+// return item;
+// }
// private JMenuItem createAmberRunItem() {
// JMenuItem item = new JMenuItem("Amber Run...");
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GlobusFileTransferWindow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GlobusFileTransferWindow.java?rev=1552047&r1=1552046&r2=1552047&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GlobusFileTransferWindow.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/GlobusFileTransferWindow.java Wed Dec 18 17:51:33 2013
@@ -1,258 +1,258 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.ui.dialogs;
-
-import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.widgets.GridPanel;
-import org.apache.airavata.xbaya.ui.widgets.XBayaComboBox;
-import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
-import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
-import org.apache.airavata.xbaya.util.GlobusOnlineUtils;
-import org.apache.airavata.xbaya.util.TransferFile;
-import org.globusonline.transfer.APIError;
-import org.json.JSONException;
-
-import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.util.ArrayList;
-import java.util.List;
-
-
-public class GlobusFileTransferWindow {
- private XBayaEngine engine;
-
- private XBayaDialog dialog;
-
- private XBayaTextField usernameTextField;
-
- private JPasswordField pwdTextField;
-
- private XBayaComboBox sourceEndpointTextField;
-
- private XBayaTextField sourceFilePathTextField;
-
- private XBayaComboBox destEndpointTextField;
-
- private XBayaTextField destFilePathTextField;
-
- private XBayaTextField transferLabelTextField;
-
- private GlobusOnlineUtils globusOnlineUtils;
-
-
- private String goUserName;
- private String goPWD;
-
- /**
- * @param engine XBaya workflow engine
- */
- public GlobusFileTransferWindow(XBayaEngine engine) {
- this.engine = engine;
- initGUI();
- }
-
- /**
- * Displays the dialog.
- */
- public void show() {
- this.dialog.show();
- }
-
- private void hide() {
- this.dialog.hide();
- }
-
- private void ok() {
-
- goUserName = this.usernameTextField.getText();
- goPWD = new String(this.pwdTextField.getPassword());
-
- String sourceEndpoint = this.sourceEndpointTextField.getText();
- String sourceFilePath = this.sourceFilePathTextField.getText();
- String destEndpoint = this.destEndpointTextField.getText();
- String destFilePath = this.destFilePathTextField.getText();
- String transferLabel = this.transferLabelTextField.getText();
-
- if(globusOnlineUtils == null){
- globusOnlineUtils = new GlobusOnlineUtils(goUserName, goPWD);
- }
- TransferFile transferFile = globusOnlineUtils.getTransferFile(sourceEndpoint, destEndpoint, sourceFilePath, destFilePath, transferLabel);
- globusOnlineUtils.transferFiles(transferFile);
- }
-
- private String[] getGOEndpointList(){
- if (getGoUserName() != null && getGoPWD() != null){
- globusOnlineUtils = new GlobusOnlineUtils(goUserName, goPWD);
- }
- List<String> epList = new ArrayList<String>();
- try {
- if (globusOnlineUtils != null){
- epList = globusOnlineUtils.getEPList();
- }
- } catch (IOException e) {
- e.printStackTrace();
- } catch (APIError apiError) {
- apiError.printStackTrace();
- } catch (GeneralSecurityException e) {
- e.printStackTrace();
- } catch (JSONException e) {
- e.printStackTrace();
- }
- return epList.toArray(new String[]{});
- }
-
- /**
- * Initializes the GUI.
- */
- private void initGUI() {
- this.usernameTextField = new XBayaTextField();
- this.pwdTextField = new JPasswordField();
- JButton authenticateButton = new JButton("Authenticate");
-
- XBayaLabel nameLabel = new XBayaLabel("GO Username", this.usernameTextField);
- XBayaLabel pwdLabel = new XBayaLabel("GO Password", this.pwdTextField);
- JLabel authLabel = new JLabel("");
-
- GridPanel infoPanel = new GridPanel();
- GridPanel authButtonPanel = new GridPanel();
- GridPanel otherPanel = new GridPanel();
-
- authButtonPanel.add(nameLabel.getSwingComponent());
- authButtonPanel.add(this.usernameTextField.getSwingComponent());
- authButtonPanel.add(pwdLabel.getSwingComponent());
- authButtonPanel.add(this.pwdTextField);
- authButtonPanel.add(authLabel);
- authButtonPanel.add(authenticateButton);
-
- authButtonPanel.layout(3,2,GridPanel.WEIGHT_NONE, 1);
-
- String[] goEndpointList = getGOEndpointList();
- DefaultComboBoxModel cmbModelJobType1 = new DefaultComboBoxModel(goEndpointList);
- sourceEndpointTextField = new XBayaComboBox(cmbModelJobType1);
- sourceEndpointTextField.setEditable(true);
-
- sourceFilePathTextField = new XBayaTextField();
- DefaultComboBoxModel cmbModelJobType2 = new DefaultComboBoxModel(goEndpointList);
- destEndpointTextField = new XBayaComboBox(cmbModelJobType2);
- destEndpointTextField.setEditable(true);
- destFilePathTextField = new XBayaTextField();
- transferLabelTextField = new XBayaTextField();
-
- XBayaLabel sourceEprLabel = new XBayaLabel("Source Endpoint", sourceEndpointTextField);
- XBayaLabel sourceFilePathLabel = new XBayaLabel("Source File Path", sourceFilePathTextField);
- XBayaLabel destEprLabel = new XBayaLabel("Destination Endpoint", destEndpointTextField);
- XBayaLabel destFilePathLabel = new XBayaLabel("Destination FIle path", destFilePathTextField);
- XBayaLabel labelTransferLabel = new XBayaLabel("Label This Transfer", destFilePathTextField);
-
-
- otherPanel.add(sourceEprLabel.getSwingComponent());
- otherPanel.add(sourceEndpointTextField.getSwingComponent());
- otherPanel.add(sourceFilePathLabel.getSwingComponent());
- otherPanel.add(sourceFilePathTextField.getSwingComponent());
- otherPanel.add(destEprLabel.getSwingComponent());
- otherPanel.add(destEndpointTextField.getSwingComponent());
- otherPanel.add(destFilePathLabel.getSwingComponent());
- otherPanel.add(destFilePathTextField.getSwingComponent());
- otherPanel.add(labelTransferLabel.getSwingComponent());
- otherPanel.add(transferLabelTextField.getSwingComponent());
-
- otherPanel.layout(5, 2, GridPanel.WEIGHT_NONE, 1);
- infoPanel.add(authButtonPanel);
-
- infoPanel.add(otherPanel);
- JPanel buttonPanel = new JPanel();
- infoPanel.add(buttonPanel);
-
- infoPanel.layout(3, 1, GridPanel.WEIGHT_NONE, GridPanel.WEIGHT_NONE);
-
- JButton okButton = new JButton("OK");
- okButton.addActionListener(new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- ok();
- }
- });
-
- JButton cancelButton = new JButton("Cancel");
- cancelButton.addActionListener(new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- hide();
- }
- });
-
- buttonPanel.add(okButton);
- buttonPanel.add(cancelButton);
-
- usernameTextField.getSwingComponent().addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- setGoUserName(usernameTextField.getText());
- }
- }
- );
-
- pwdTextField.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent event) {
- setGoPWD(new String(pwdTextField.getPassword()));
- }
- }
- );
-
- authenticateButton.addActionListener(new ActionListener() {
-
- @Override
- public void actionPerformed(ActionEvent actionEvent) {
- goUserName = usernameTextField.getText();
- goPWD = new String(pwdTextField.getPassword());
-
- if (goUserName != null && goPWD != null){
- globusOnlineUtils = new GlobusOnlineUtils(usernameTextField.getText(), new String(pwdTextField.getPassword()));
- String[] goEndpointList = getGOEndpointList();
- DefaultComboBoxModel comboBoxModel1 = new DefaultComboBoxModel(goEndpointList);
- DefaultComboBoxModel comboBoxModel2 = new DefaultComboBoxModel(goEndpointList);
- sourceEndpointTextField.setModel(comboBoxModel1);
- destEndpointTextField.setModel(comboBoxModel2);
- }
- }
- });
-
- this.dialog = new XBayaDialog(this.engine.getGUI(), "Globus file transfer", infoPanel, buttonPanel);
- this.dialog.setDefaultButton(okButton);
- }
-
- public String getGoUserName() {
- return goUserName;
- }
-
- public void setGoUserName(String goUserName) {
- this.goUserName = goUserName;
- }
-
- public String getGoPWD() {
- return goPWD;
- }
-
- public void setGoPWD(String goPWD) {
- this.goPWD = goPWD;
- }
-}
+///*
+//*
+//* Licensed to the Apache Software Foundation (ASF) under one
+//* or more contributor license agreements. See the NOTICE file
+//* distributed with this work for additional information
+//* regarding copyright ownership. The ASF licenses this file
+//* to you under the Apache License, Version 2.0 (the
+//* "License"); you may not use this file except in compliance
+//* with the License. You may obtain a copy of the License at
+//*
+//* http://www.apache.org/licenses/LICENSE-2.0
+//*
+//* Unless required by applicable law or agreed to in writing,
+//* software distributed under the License is distributed on an
+//* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+//* KIND, either express or implied. See the License for the
+//* specific language governing permissions and limitations
+//* under the License.
+//*
+//*/
+//
+//package org.apache.airavata.xbaya.ui.dialogs;
+//
+//import org.apache.airavata.xbaya.XBayaEngine;
+//import org.apache.airavata.xbaya.ui.widgets.GridPanel;
+//import org.apache.airavata.xbaya.ui.widgets.XBayaComboBox;
+//import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
+//import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
+//import org.apache.airavata.xbaya.util.GlobusOnlineUtils;
+//import org.apache.airavata.xbaya.util.TransferFile;
+//import org.globusonline.transfer.APIError;
+//import org.json.JSONException;
+//
+//import javax.swing.*;
+//import java.awt.event.ActionEvent;
+//import java.awt.event.ActionListener;
+//import java.io.IOException;
+//import java.security.GeneralSecurityException;
+//import java.util.ArrayList;
+//import java.util.List;
+//
+//
+//public class GlobusFileTransferWindow {
+// private XBayaEngine engine;
+//
+// private XBayaDialog dialog;
+//
+// private XBayaTextField usernameTextField;
+//
+// private JPasswordField pwdTextField;
+//
+// private XBayaComboBox sourceEndpointTextField;
+//
+// private XBayaTextField sourceFilePathTextField;
+//
+// private XBayaComboBox destEndpointTextField;
+//
+// private XBayaTextField destFilePathTextField;
+//
+// private XBayaTextField transferLabelTextField;
+//
+// private GlobusOnlineUtils globusOnlineUtils;
+//
+//
+// private String goUserName;
+// private String goPWD;
+//
+// /**
+// * @param engine XBaya workflow engine
+// */
+// public GlobusFileTransferWindow(XBayaEngine engine) {
+// this.engine = engine;
+// initGUI();
+// }
+//
+// /**
+// * Displays the dialog.
+// */
+// public void show() {
+// this.dialog.show();
+// }
+//
+// private void hide() {
+// this.dialog.hide();
+// }
+//
+// private void ok() {
+//
+// goUserName = this.usernameTextField.getText();
+// goPWD = new String(this.pwdTextField.getPassword());
+//
+// String sourceEndpoint = this.sourceEndpointTextField.getText();
+// String sourceFilePath = this.sourceFilePathTextField.getText();
+// String destEndpoint = this.destEndpointTextField.getText();
+// String destFilePath = this.destFilePathTextField.getText();
+// String transferLabel = this.transferLabelTextField.getText();
+//
+// if(globusOnlineUtils == null){
+// globusOnlineUtils = new GlobusOnlineUtils(goUserName, goPWD);
+// }
+// TransferFile transferFile = globusOnlineUtils.getTransferFile(sourceEndpoint, destEndpoint, sourceFilePath, destFilePath, transferLabel);
+// globusOnlineUtils.transferFiles(transferFile);
+// }
+//
+// private String[] getGOEndpointList(){
+// if (getGoUserName() != null && getGoPWD() != null){
+// globusOnlineUtils = new GlobusOnlineUtils(goUserName, goPWD);
+// }
+// List<String> epList = new ArrayList<String>();
+// try {
+// if (globusOnlineUtils != null){
+// epList = globusOnlineUtils.getEPList();
+// }
+// } catch (IOException e) {
+// e.printStackTrace();
+// } catch (APIError apiError) {
+// apiError.printStackTrace();
+// } catch (GeneralSecurityException e) {
+// e.printStackTrace();
+// } catch (JSONException e) {
+// e.printStackTrace();
+// }
+// return epList.toArray(new String[]{});
+// }
+//
+// /**
+// * Initializes the GUI.
+// */
+// private void initGUI() {
+// this.usernameTextField = new XBayaTextField();
+// this.pwdTextField = new JPasswordField();
+// JButton authenticateButton = new JButton("Authenticate");
+//
+// XBayaLabel nameLabel = new XBayaLabel("GO Username", this.usernameTextField);
+// XBayaLabel pwdLabel = new XBayaLabel("GO Password", this.pwdTextField);
+// JLabel authLabel = new JLabel("");
+//
+// GridPanel infoPanel = new GridPanel();
+// GridPanel authButtonPanel = new GridPanel();
+// GridPanel otherPanel = new GridPanel();
+//
+// authButtonPanel.add(nameLabel.getSwingComponent());
+// authButtonPanel.add(this.usernameTextField.getSwingComponent());
+// authButtonPanel.add(pwdLabel.getSwingComponent());
+// authButtonPanel.add(this.pwdTextField);
+// authButtonPanel.add(authLabel);
+// authButtonPanel.add(authenticateButton);
+//
+// authButtonPanel.layout(3,2,GridPanel.WEIGHT_NONE, 1);
+//
+// String[] goEndpointList = getGOEndpointList();
+// DefaultComboBoxModel cmbModelJobType1 = new DefaultComboBoxModel(goEndpointList);
+// sourceEndpointTextField = new XBayaComboBox(cmbModelJobType1);
+// sourceEndpointTextField.setEditable(true);
+//
+// sourceFilePathTextField = new XBayaTextField();
+// DefaultComboBoxModel cmbModelJobType2 = new DefaultComboBoxModel(goEndpointList);
+// destEndpointTextField = new XBayaComboBox(cmbModelJobType2);
+// destEndpointTextField.setEditable(true);
+// destFilePathTextField = new XBayaTextField();
+// transferLabelTextField = new XBayaTextField();
+//
+// XBayaLabel sourceEprLabel = new XBayaLabel("Source Endpoint", sourceEndpointTextField);
+// XBayaLabel sourceFilePathLabel = new XBayaLabel("Source File Path", sourceFilePathTextField);
+// XBayaLabel destEprLabel = new XBayaLabel("Destination Endpoint", destEndpointTextField);
+// XBayaLabel destFilePathLabel = new XBayaLabel("Destination FIle path", destFilePathTextField);
+// XBayaLabel labelTransferLabel = new XBayaLabel("Label This Transfer", destFilePathTextField);
+//
+//
+// otherPanel.add(sourceEprLabel.getSwingComponent());
+// otherPanel.add(sourceEndpointTextField.getSwingComponent());
+// otherPanel.add(sourceFilePathLabel.getSwingComponent());
+// otherPanel.add(sourceFilePathTextField.getSwingComponent());
+// otherPanel.add(destEprLabel.getSwingComponent());
+// otherPanel.add(destEndpointTextField.getSwingComponent());
+// otherPanel.add(destFilePathLabel.getSwingComponent());
+// otherPanel.add(destFilePathTextField.getSwingComponent());
+// otherPanel.add(labelTransferLabel.getSwingComponent());
+// otherPanel.add(transferLabelTextField.getSwingComponent());
+//
+// otherPanel.layout(5, 2, GridPanel.WEIGHT_NONE, 1);
+// infoPanel.add(authButtonPanel);
+//
+// infoPanel.add(otherPanel);
+// JPanel buttonPanel = new JPanel();
+// infoPanel.add(buttonPanel);
+//
+// infoPanel.layout(3, 1, GridPanel.WEIGHT_NONE, GridPanel.WEIGHT_NONE);
+//
+// JButton okButton = new JButton("OK");
+// okButton.addActionListener(new AbstractAction() {
+// public void actionPerformed(ActionEvent e) {
+// ok();
+// }
+// });
+//
+// JButton cancelButton = new JButton("Cancel");
+// cancelButton.addActionListener(new AbstractAction() {
+// public void actionPerformed(ActionEvent e) {
+// hide();
+// }
+// });
+//
+// buttonPanel.add(okButton);
+// buttonPanel.add(cancelButton);
+//
+// usernameTextField.getSwingComponent().addActionListener(new ActionListener() {
+// public void actionPerformed(ActionEvent event) {
+// setGoUserName(usernameTextField.getText());
+// }
+// }
+// );
+//
+// pwdTextField.addActionListener(new ActionListener() {
+// public void actionPerformed(ActionEvent event) {
+// setGoPWD(new String(pwdTextField.getPassword()));
+// }
+// }
+// );
+//
+// authenticateButton.addActionListener(new ActionListener() {
+//
+// @Override
+// public void actionPerformed(ActionEvent actionEvent) {
+// goUserName = usernameTextField.getText();
+// goPWD = new String(pwdTextField.getPassword());
+//
+// if (goUserName != null && goPWD != null){
+// globusOnlineUtils = new GlobusOnlineUtils(usernameTextField.getText(), new String(pwdTextField.getPassword()));
+// String[] goEndpointList = getGOEndpointList();
+// DefaultComboBoxModel comboBoxModel1 = new DefaultComboBoxModel(goEndpointList);
+// DefaultComboBoxModel comboBoxModel2 = new DefaultComboBoxModel(goEndpointList);
+// sourceEndpointTextField.setModel(comboBoxModel1);
+// destEndpointTextField.setModel(comboBoxModel2);
+// }
+// }
+// });
+//
+// this.dialog = new XBayaDialog(this.engine.getGUI(), "Globus file transfer", infoPanel, buttonPanel);
+// this.dialog.setDefaultButton(okButton);
+// }
+//
+// public String getGoUserName() {
+// return goUserName;
+// }
+//
+// public void setGoUserName(String goUserName) {
+// this.goUserName = goUserName;
+// }
+//
+// public String getGoPWD() {
+// return goPWD;
+// }
+//
+// public void setGoPWD(String goPWD) {
+// this.goPWD = goPWD;
+// }
+//}
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java?rev=1552047&r1=1552046&r2=1552047&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/XBayaMenu.java Wed Dec 18 17:51:33 2013
@@ -26,7 +26,7 @@ import org.apache.airavata.xbaya.XBayaCo
import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
-import org.apache.airavata.xbaya.menues.tools.ToolsMenuItem;
+//import org.apache.airavata.xbaya.menues.tools.ToolsMenuItem;
import org.apache.airavata.xbaya.ui.XBayaGUI;
import org.apache.airavata.xbaya.ui.dialogs.AboutWindow;
import org.apache.airavata.xbaya.ui.widgets.XBayaComponent;
@@ -54,7 +54,7 @@ public class XBayaMenu implements XBayaC
private AmazonEC2MenuItem amazonEC2MenuItem;
- private ToolsMenuItem toolsMenuItem;
+// private ToolsMenuItem toolsMenuItem;
private XBayaGUI gui;
@@ -79,7 +79,7 @@ public class XBayaMenu implements XBayaC
viewMenuItem = new ViewMenuItem(getEngine());
runMenuItem = new RunMenuItem(getEngine(), getToolBar());
registryMenuItem = new RegistryMenuItem(getEngine(),getToolBar());
- toolsMenuItem = new ToolsMenuItem(getEngine());
+// toolsMenuItem = new ToolsMenuItem(getEngine());
createMenuBar();
executionModeChanged(getEngine().getConfiguration());
@@ -103,7 +103,7 @@ public class XBayaMenu implements XBayaC
menuBar.add(editMenuItem.getMenu());
menuBar.add(viewMenuItem.getMenu());
menuBar.add(runMenuItem.getMenu());
- menuBar.add(toolsMenuItem.getMenu());
+// menuBar.add(toolsMenuItem.getMenu());
menuBar.add(registryMenuItem.getMenu());
menuBar.add(amazonEC2MenuItem.getMenu());
// Space before Help
Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/GlobusOnlineUtils.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/GlobusOnlineUtils.java?rev=1552047&r1=1552046&r2=1552047&view=diff
==============================================================================
--- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/GlobusOnlineUtils.java (original)
+++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/GlobusOnlineUtils.java Wed Dec 18 17:51:33 2013
@@ -1,245 +1,245 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.util;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpHost;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
-import org.apache.http.client.AuthCache;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.CredentialsProvider;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.impl.auth.BasicScheme;
-import org.apache.http.impl.client.BasicAuthCache;
-import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
-import org.globusonline.transfer.APIError;
-import org.globusonline.transfer.Authenticator;
-import org.globusonline.transfer.GoauthAuthenticator;
-import org.globusonline.transfer.JSONTransferAPIClient;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.GeneralSecurityException;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-public class GlobusOnlineUtils {
- public static final String ACCESS_TOKEN = "access_token";
-
- private static String goUserName;
- private static String goPWD;
-
- public static void main(String[] args) {
-// String s = appendFileName("/~/Desktop/1.docx", "/~/");
-// System.out.println(s);
-
- }
-
- public GlobusOnlineUtils(String goUsername, String goPwd) {
- goUserName = goUsername;
- goPWD = goPwd;
- }
-
- public String getAuthenticationToken() {
- String token = null;
- HttpHost targetHost = new HttpHost(GOConstants.NEXUS_API_HOST, GOConstants.NEXUS_API_PORT, GOConstants.NEXUS_API_SCHEMA);
- CredentialsProvider credsProvider = new BasicCredentialsProvider();
- credsProvider.setCredentials(
- new AuthScope(targetHost.getHostName(), targetHost.getPort()),
- new UsernamePasswordCredentials(goUserName, goPWD));
-
- CloseableHttpClient httpclient = HttpClients.custom()
- .setDefaultCredentialsProvider(credsProvider).build();
- try {
-
- // Create AuthCache instance
- AuthCache authCache = new BasicAuthCache();
- // Generate BASIC scheme object and add it to the local
- // auth cache
- BasicScheme basicScheme = new BasicScheme();
- authCache.put(targetHost, basicScheme);
-
- // Add AuthCache to the execution context
- HttpClientContext localContext = HttpClientContext.create();
- localContext.setAuthCache(authCache);
-
- HttpGet httpget = new HttpGet(GOConstants.GOAUTH_TOKEN_REQ_URL);
- httpget.addHeader("accept", "application/json");
- System.out.println("executing request: " + httpget.getRequestLine());
- System.out.println("to target: " + targetHost);
-
- CloseableHttpResponse response = httpclient.execute(targetHost, httpget, localContext);
- try {
- HttpEntity entity = response.getEntity();
- InputStream entityContent = entity.getContent();
- InputStreamReader reader = new InputStreamReader(entityContent);
- JSONTokener tokenizer = new JSONTokener(reader);
- JSONObject json = new JSONObject(tokenizer);
- token = (String)json.get(ACCESS_TOKEN);
- entityContent.close();
- EntityUtils.consume(entity);
-
- } catch (JSONException e) {
- e.printStackTrace();
- } finally {
- response.close();
- }
- //}
- } catch (ClientProtocolException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- httpclient.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- return token;
- }
-
- public JSONTransferAPIClient getAuthenticated (){
- JSONTransferAPIClient jsonTransferAPIClient = null;
- try {
- String authenticationToken = getAuthenticationToken();
- Authenticator authenticator = new GoauthAuthenticator(authenticationToken);
- jsonTransferAPIClient = new JSONTransferAPIClient(goUserName,
- null, GOConstants.BASEURL);
- jsonTransferAPIClient.setAuthenticator(authenticator);
- } catch (KeyManagementException e) {
- e.printStackTrace();
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- }
- return jsonTransferAPIClient;
- }
-
- public String transferFiles (TransferFile tf){
- String taskId = null;
- try {
- JSONTransferAPIClient apiClient = getAuthenticated();
- String submissionId = apiClient.getSubmissionId();
- tf.setSubmission_id(submissionId);
- JSONObject jsonObject = new JSONObject(tf);
- JSONTransferAPIClient.Result result = apiClient.transfer(jsonObject);
- taskId = (String)result.document.get("task_id");
- } catch (IOException e) {
- e.printStackTrace();
- } catch (GeneralSecurityException e) {
- e.printStackTrace();
- } catch (JSONException e) {
- e.printStackTrace();
- } catch (APIError apiError) {
- apiError.printStackTrace();
- }
- return taskId;
- }
-
- public TransferFile getTransferFile (String sourceEp,
- String destEp,
- String sourcePath,
- String destPath,
- String label){
-
- TransferFile transferFile = new TransferFile();
-
-
- transferFile.setPreserve_timestamp(false);
- transferFile.setDATA_TYPE("transfer");
- transferFile.setEncrypt_data(false);
- transferFile.setSync_level(null);
- transferFile.setSource_endpoint(sourceEp);
- transferFile.setLabel(label);
- transferFile.setDestination_endpoint(destEp);
- transferFile.setLength(2);
- transferFile.setDeadline(getDeadlineForTransfer());
- transferFile.setNotify_on_succeeded(true);
- transferFile.setNotify_on_failed(true);
- transferFile.setVerify_checksum(false);
- transferFile.setDelete_destination_extra(false);
- Data[] datas = new Data[1];
- Data data = new Data();
- data.setDATA_TYPE("transfer_item");
- data.setDestination_path(appendFileName(sourcePath, destPath));
- data.setVerify_size(null);
- data.setSource_path(sourcePath);
- data.setRecursive(false);
- datas[0] = data;
- transferFile.setDATA(datas);
- return transferFile;
- }
-
- private static String appendFileName(String sourcePath, String destPath){
- String[] split = sourcePath.split(File.separator);
- String fileName = split[split.length - 1];
- if (destPath.endsWith(File.separator)){
- destPath = destPath.concat(fileName);
- }else {
- destPath = destPath.concat("/" + fileName);
- }
- System.out.println(destPath);
- return destPath;
- }
-
- private String getDeadlineForTransfer (){
- DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Calendar calendar = Calendar.getInstance();
- calendar.add(calendar.DAY_OF_MONTH, 1);
- Date tomorrow = calendar.getTime();
- String date = dateFormat.format(tomorrow);
- System.out.println(date);
- return date;
- }
-
- public List<String> getEPList() throws IOException, APIError, GeneralSecurityException, JSONException {
- List<String> epList = new ArrayList<String>();
- Map<String, String> params = new HashMap<String, String>();
- params.put("limit", "0");
- JSONTransferAPIClient transferAPIClient = getAuthenticated();
- JSONTransferAPIClient.Result result = transferAPIClient.getResult("/endpoint_list", params);
- JSONObject document = result.document;
- JSONArray dataArray = document.getJSONArray("DATA");
- for (int i = 0; i < dataArray.length(); i++ ){
- JSONObject jsonObject = dataArray.getJSONObject(i);
- String epName = (String)jsonObject.get("canonical_name");
- epList.add(epName);
- }
- return epList;
- }
-
-}
+///*
+// *
+// * Licensed to the Apache Software Foundation (ASF) under one
+// * or more contributor license agreements. See the NOTICE file
+// * distributed with this work for additional information
+// * regarding copyright ownership. The ASF licenses this file
+// * to you under the Apache License, Version 2.0 (the
+// * "License"); you may not use this file except in compliance
+// * with the License. You may obtain a copy of the License at
+// *
+// * http://www.apache.org/licenses/LICENSE-2.0
+// *
+// * Unless required by applicable law or agreed to in writing,
+// * software distributed under the License is distributed on an
+// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// * KIND, either express or implied. See the License for the
+// * specific language governing permissions and limitations
+// * under the License.
+// *
+// */
+//
+//package org.apache.airavata.xbaya.util;
+//
+//import org.apache.http.HttpEntity;
+//import org.apache.http.HttpHost;
+//import org.apache.http.auth.AuthScope;
+//import org.apache.http.auth.UsernamePasswordCredentials;
+//import org.apache.http.client.AuthCache;
+//import org.apache.http.client.ClientProtocolException;
+//import org.apache.http.client.CredentialsProvider;
+//import org.apache.http.client.methods.CloseableHttpResponse;
+//import org.apache.http.client.methods.HttpGet;
+//import org.apache.http.client.protocol.HttpClientContext;
+//import org.apache.http.impl.auth.BasicScheme;
+//import org.apache.http.impl.client.BasicAuthCache;
+//import org.apache.http.impl.client.BasicCredentialsProvider;
+//import org.apache.http.impl.client.CloseableHttpClient;
+//import org.apache.http.impl.client.HttpClients;
+//import org.apache.http.util.EntityUtils;
+//import org.globusonline.transfer.APIError;
+//import org.globusonline.transfer.Authenticator;
+//import org.globusonline.transfer.GoauthAuthenticator;
+//import org.globusonline.transfer.JSONTransferAPIClient;
+//import org.json.JSONArray;
+//import org.json.JSONException;
+//import org.json.JSONObject;
+//import org.json.JSONTokener;
+//
+//import java.io.File;
+//import java.io.IOException;
+//import java.io.InputStream;
+//import java.io.InputStreamReader;
+//import java.security.GeneralSecurityException;
+//import java.security.KeyManagementException;
+//import java.security.NoSuchAlgorithmException;
+//import java.text.DateFormat;
+//import java.text.SimpleDateFormat;
+//import java.util.*;
+//
+//public class GlobusOnlineUtils {
+// public static final String ACCESS_TOKEN = "access_token";
+//
+// private static String goUserName;
+// private static String goPWD;
+//
+// public static void main(String[] args) {
+//// String s = appendFileName("/~/Desktop/1.docx", "/~/");
+//// System.out.println(s);
+//
+// }
+//
+// public GlobusOnlineUtils(String goUsername, String goPwd) {
+// goUserName = goUsername;
+// goPWD = goPwd;
+// }
+//
+// public String getAuthenticationToken() {
+// String token = null;
+// HttpHost targetHost = new HttpHost(GOConstants.NEXUS_API_HOST, GOConstants.NEXUS_API_PORT, GOConstants.NEXUS_API_SCHEMA);
+// CredentialsProvider credsProvider = new BasicCredentialsProvider();
+// credsProvider.setCredentials(
+// new AuthScope(targetHost.getHostName(), targetHost.getPort()),
+// new UsernamePasswordCredentials(goUserName, goPWD));
+//
+// CloseableHttpClient httpclient = HttpClients.custom()
+// .setDefaultCredentialsProvider(credsProvider).build();
+// try {
+//
+// // Create AuthCache instance
+// AuthCache authCache = new BasicAuthCache();
+// // Generate BASIC scheme object and add it to the local
+// // auth cache
+// BasicScheme basicScheme = new BasicScheme();
+// authCache.put(targetHost, basicScheme);
+//
+// // Add AuthCache to the execution context
+// HttpClientContext localContext = HttpClientContext.create();
+// localContext.setAuthCache(authCache);
+//
+// HttpGet httpget = new HttpGet(GOConstants.GOAUTH_TOKEN_REQ_URL);
+// httpget.addHeader("accept", "application/json");
+// System.out.println("executing request: " + httpget.getRequestLine());
+// System.out.println("to target: " + targetHost);
+//
+// CloseableHttpResponse response = httpclient.execute(targetHost, httpget, localContext);
+// try {
+// HttpEntity entity = response.getEntity();
+// InputStream entityContent = entity.getContent();
+// InputStreamReader reader = new InputStreamReader(entityContent);
+// JSONTokener tokenizer = new JSONTokener(reader);
+// JSONObject json = new JSONObject(tokenizer);
+// token = (String)json.get(ACCESS_TOKEN);
+// entityContent.close();
+// EntityUtils.consume(entity);
+//
+// } catch (JSONException e) {
+// e.printStackTrace();
+// } finally {
+// response.close();
+// }
+// //}
+// } catch (ClientProtocolException e) {
+// e.printStackTrace();
+// } catch (IOException e) {
+// e.printStackTrace();
+// } finally {
+// try {
+// httpclient.close();
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+// }
+// return token;
+// }
+//
+// public JSONTransferAPIClient getAuthenticated (){
+// JSONTransferAPIClient jsonTransferAPIClient = null;
+// try {
+// String authenticationToken = getAuthenticationToken();
+// Authenticator authenticator = new GoauthAuthenticator(authenticationToken);
+// jsonTransferAPIClient = new JSONTransferAPIClient(goUserName,
+// null, GOConstants.BASEURL);
+// jsonTransferAPIClient.setAuthenticator(authenticator);
+// } catch (KeyManagementException e) {
+// e.printStackTrace();
+// } catch (NoSuchAlgorithmException e) {
+// e.printStackTrace();
+// }
+// return jsonTransferAPIClient;
+// }
+//
+// public String transferFiles (TransferFile tf){
+// String taskId = null;
+// try {
+// JSONTransferAPIClient apiClient = getAuthenticated();
+// String submissionId = apiClient.getSubmissionId();
+// tf.setSubmission_id(submissionId);
+// JSONObject jsonObject = new JSONObject(tf);
+// JSONTransferAPIClient.Result result = apiClient.transfer(jsonObject);
+// taskId = (String)result.document.get("task_id");
+// } catch (IOException e) {
+// e.printStackTrace();
+// } catch (GeneralSecurityException e) {
+// e.printStackTrace();
+// } catch (JSONException e) {
+// e.printStackTrace();
+// } catch (APIError apiError) {
+// apiError.printStackTrace();
+// }
+// return taskId;
+// }
+//
+// public TransferFile getTransferFile (String sourceEp,
+// String destEp,
+// String sourcePath,
+// String destPath,
+// String label){
+//
+// TransferFile transferFile = new TransferFile();
+//
+//
+// transferFile.setPreserve_timestamp(false);
+// transferFile.setDATA_TYPE("transfer");
+// transferFile.setEncrypt_data(false);
+// transferFile.setSync_level(null);
+// transferFile.setSource_endpoint(sourceEp);
+// transferFile.setLabel(label);
+// transferFile.setDestination_endpoint(destEp);
+// transferFile.setLength(2);
+// transferFile.setDeadline(getDeadlineForTransfer());
+// transferFile.setNotify_on_succeeded(true);
+// transferFile.setNotify_on_failed(true);
+// transferFile.setVerify_checksum(false);
+// transferFile.setDelete_destination_extra(false);
+// Data[] datas = new Data[1];
+// Data data = new Data();
+// data.setDATA_TYPE("transfer_item");
+// data.setDestination_path(appendFileName(sourcePath, destPath));
+// data.setVerify_size(null);
+// data.setSource_path(sourcePath);
+// data.setRecursive(false);
+// datas[0] = data;
+// transferFile.setDATA(datas);
+// return transferFile;
+// }
+//
+// private static String appendFileName(String sourcePath, String destPath){
+// String[] split = sourcePath.split(File.separator);
+// String fileName = split[split.length - 1];
+// if (destPath.endsWith(File.separator)){
+// destPath = destPath.concat(fileName);
+// }else {
+// destPath = destPath.concat("/" + fileName);
+// }
+// System.out.println(destPath);
+// return destPath;
+// }
+//
+// private String getDeadlineForTransfer (){
+// DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+// Calendar calendar = Calendar.getInstance();
+// calendar.add(calendar.DAY_OF_MONTH, 1);
+// Date tomorrow = calendar.getTime();
+// String date = dateFormat.format(tomorrow);
+// System.out.println(date);
+// return date;
+// }
+//
+// public List<String> getEPList() throws IOException, APIError, GeneralSecurityException, JSONException {
+// List<String> epList = new ArrayList<String>();
+// Map<String, String> params = new HashMap<String, String>();
+// params.put("limit", "0");
+// JSONTransferAPIClient transferAPIClient = getAuthenticated();
+// JSONTransferAPIClient.Result result = transferAPIClient.getResult("/endpoint_list", params);
+// JSONObject document = result.document;
+// JSONArray dataArray = document.getJSONArray("DATA");
+// for (int i = 0; i < dataArray.length(); i++ ){
+// JSONObject jsonObject = dataArray.getJSONObject(i);
+// String epName = (String)jsonObject.get("canonical_name");
+// epList.add(epName);
+// }
+// return epList;
+// }
+//
+//}
Modified: airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1552047&r1=1552046&r2=1552047&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Wed Dec 18 17:51:33 2013
@@ -342,11 +342,16 @@
</dependencyManagement>
<repositories>
- <repository>
+ <repository>
<name>ogce.m2.all</name>
<id>ogce.m2.all</id>
<url>http://community.ucs.indiana.edu:9090/archiva/repository/ogce.m2.all</url>
</repository>
+ <!--<repository>-->
+ <!--<name>go.nexus.repo</name>-->
+ <!--<id>go.nexus.repo</id>-->
+ <!--<url>http://code.ceres.auckland.ac.nz/nexus/content/repositories/releases/</url>-->
+ <!--</repository>-->
<repository>
<id>central</id>
<name>Maven Central</name>
@@ -358,6 +363,7 @@
<enabled>false</enabled>
</snapshots>
</repository>
+
<repository>
<id>unicore.eu</id>
<name>UNICORE repository</name>