JBoss Tools SVN: r25952 - in trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd: jpdl/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-10-20 14:19:15 -0400 (Wed, 20 Oct 2010)
New Revision: 25952
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/Editor.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java
Log:
JBIDE-7369
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/Editor.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/Editor.java 2010-10-20 17:55:41 UTC (rev 25951)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/common/editor/Editor.java 2010-10-20 18:19:15 UTC (rev 25952)
@@ -9,6 +9,7 @@
import org.eclipse.core.resources.ResourceAttributes;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.EditDomain;
import org.eclipse.gef.commands.CommandStack;
@@ -336,9 +337,9 @@
private boolean checkReadOnly() {
IFile inputFile = ((FileEditorInput)getEditorInput()).getFile();
- IFolder inputFolder = (IFolder)inputFile.getParent();
- IFile notationInfoFile = inputFolder.getFile(getContentProvider().getNotationInfoFileName(inputFile.getName()));
- IFile diagramImageFile = inputFolder.getFile(getContentProvider().getDiagramImageFileName(inputFile.getName()));
+ IContainer inputFolder = (IContainer)inputFile.getParent();
+ IFile notationInfoFile = inputFolder.getFile(new Path(getContentProvider().getNotationInfoFileName(inputFile.getName())));
+ IFile diagramImageFile = inputFolder.getFile(new Path(getContentProvider().getDiagramImageFileName(inputFile.getName())));
String readOnlyFiles = "";
ArrayList readOnlyFilesList = new ArrayList();
if (inputFile.isReadOnly()) {
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java 2010-10-20 17:55:41 UTC (rev 25951)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizard.java 2010-10-20 18:19:15 UTC (rev 25952)
@@ -73,10 +73,9 @@
public boolean performFinish() {
try {
- IFolder folder = page.getProcessFolder();
- IFile processDefinitionFile = folder.getFile(page.getProcessName() + ".jpdl.xml");
+ IFile processDefinitionFile = page.getProcessDefinitionFile();
processDefinitionFile.create(createInitialProcessDefinition(), true, null);
- IFile gpdFile = folder.getFile("." + page.getProcessName() + ".gpd.xml");
+ IFile gpdFile = page.getGpdFile();
gpdFile.create(createInitialGpdInfo(), true, null);
IDE.openEditor(getActivePage(), processDefinitionFile);
openPropertiesView();
@@ -135,7 +134,7 @@
private String getJbpmSchemaNameSpace() throws JavaModelException {
try {
- IProject project = page.getProcessFolder().getProject();
+ IProject project = page.getProcessDefinitionFile().getProject();
String jbpmName = project.getPersistentProperty(new QualifiedName("", "jbpmName"));
if (jbpmName == null) return "";
JbpmInstallation jbpmInstallation = Jbpm3PreferencesManager.INSTANCE.getJbpmInstallation(jbpmName);
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2010-10-20 17:55:41 UTC (rev 25951)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/NewProcessDefinitionWizardPage.java 2010-10-20 18:19:15 UTC (rev 25952)
@@ -23,7 +23,6 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspaceRoot;
@@ -233,16 +232,27 @@
}
private boolean processExists() {
- IFolder folder = getProcessFolder();
- IFile processDefinitionFile = folder.getFile(getProcessName() + ".jpdl.xml");
- IFile gpdFile = folder.getFile("." + getProcessName() + ".gpd.xml");
- return processDefinitionFile.exists() || gpdFile.exists();
+ return getProcessDefinitionFile().exists() || getGpdFile().exists();
}
- public IFolder getProcessFolder() {
- return workspaceRoot.getFolder(new Path(containerText.getText()));
+ private IPath getProcessDefinitionFilePath() {
+ String path = containerText.getText() + "/" + getProcessName() + ".jpdl.xml";
+ return new Path(path);
}
+ private IPath getGpdFilePath() {
+ String path = containerText.getText() + "/." + getProcessName() + ".gpd.xml";
+ return new Path(path);
+ }
+
+ IFile getProcessDefinitionFile() {
+ return workspaceRoot.getFile(getProcessDefinitionFilePath());
+ }
+
+ IFile getGpdFile() {
+ return workspaceRoot.getFile(getGpdFilePath());
+ }
+
public String getProcessName() {
return processNameText.getText();
}
13 years, 8 months
JBoss Tools SVN: r25951 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2010-10-20 13:55:41 -0400 (Wed, 20 Oct 2010)
New Revision: 25951
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java
Log:
Reverting last commit
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java 2010-10-20 17:14:52 UTC (rev 25950)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTTestExt.java 2010-10-20 17:55:41 UTC (rev 25951)
@@ -48,6 +48,14 @@
*/
public static final ConfiguredState configuredState = new ConfiguredState();
+ public static Properties properties;
+ /**
+ * Get properties for tests
+ * @param key
+ */
+ public static String getProperty(String key) {
+ return util.getValue(properties,key);
+ }
static {
System.setProperty("org.eclipse.swtbot.playback.delay","10");
}
13 years, 8 months
JBoss Tools SVN: r25950 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-20 13:14:52 -0400 (Wed, 20 Oct 2010)
New Revision: 25950
Modified:
trunk/build/parent/pom.xml
Log:
add http://download.jboss.org/jbosstools/updates/target-platform/latest/ as enabled-by-default repo against which to resolve deps
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2010-10-20 17:11:53 UTC (rev 25949)
+++ trunk/build/parent/pom.xml 2010-10-20 17:14:52 UTC (rev 25950)
@@ -227,7 +227,7 @@
<profile>
<id>helios-remote-target</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<repositories>
<repository>
@@ -286,6 +286,13 @@
</activation>
<repositories>
<repository>
+ <id>jbosstools-target-platform-repo</id>
+ <url>http://download.jboss.org/jbosstools/updates/target-platform/latest/</url>
+ <layout>p2</layout>
+ <snapshots><enabled>true</enabled></snapshots>
+ <releases><enabled>true</enabled></releases>
+ </repository>
+ <repository>
<id>helios</id>
<url>http://download.eclipse.org/releases/helios/</url>
<layout>p2</layout>
13 years, 8 months
JBoss Tools SVN: r25949 - trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette.
by jbosstools-commits＠lists.jboss.org
Author: bbrodt
Date: 2010-10-20 13:11:53 -0400 (Wed, 20 Oct 2010)
New Revision: 25949
Modified:
trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/GraphicalEditorWithPalette.java
Log:
https://jira.jboss.org/browse/JBIDE-7254
Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/GraphicalEditorWithPalette.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/GraphicalEditorWithPalette.java 2010-10-20 17:03:39 UTC (rev 25948)
+++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/src/org/eclipse/bpel/common/ui/palette/GraphicalEditorWithPalette.java 2010-10-20 17:11:53 UTC (rev 25949)
@@ -128,7 +128,12 @@
@Override
public void selectionChanged(IWorkbenchPart part, ISelection selection) {
- updateActions(getSelectionActions());
+ // https://jira.jboss.org/browse/JBIDE-7254
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ updateActions(getSelectionActions());
+ }
+ });
}
@Override
13 years, 8 months
JBoss Tools SVN: r25947 - trunk/jst/plugins/org.jboss.tools.jst.jsp.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-10-20 10:59:45 -0400 (Wed, 20 Oct 2010)
New Revision: 25947
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties
Log:
https://jira.jboss.org/browse/JBIDE-6385: Create icon for Externalize Strings Action in the VPE toolbar
- added icon folder to build.properties
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2010-10-20 14:22:51 UTC (rev 25946)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/build.properties 2010-10-20 14:59:45 UTC (rev 25947)
@@ -4,7 +4,8 @@
images/,\
about.html,\
META-INF/,\
- .
+ .,\
+ icons/
src.includes = resources/
jars.compile.order = .
output.. = bin/
13 years, 8 months
JBoss Tools SVN: r25946 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-10-20 10:22:51 -0400 (Wed, 20 Oct 2010)
New Revision: 25946
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
Log:
JBIDE-7201
SeamELContentAssist tests failures
SeamELContentAssisTestCase is fixed
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2010-10-20 14:15:32 UTC (rev 25945)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTestCase.java 2010-10-20 14:22:51 UTC (rev 25946)
@@ -78,14 +78,13 @@
"identity:addRole(arg0)",
"identity:authenticate",
"identity:authenticate()",
- "identity:authenticate(loginContext)",
"identity:authenticateMethod",
"identity:checkEntityPermission",
- "identity:checkEntityPermission(arg0, arg1)",
+ "identity:checkEntityPermission()",
"identity:checkPermission",
- "identity:checkPermission(name, action, arg)",
+ "identity:checkPermission()",
"identity:checkRestriction",
- "identity:checkRestriction(expr)",
+ "identity:checkRestriction()",
"identity:checkRole",
"identity:checkRole(role)",
"identity:clearDirty",
@@ -95,9 +94,9 @@
"identity:create",
"identity:create()",
"identity:hasPermission",
- "identity:hasPermission(name, action, arg)",
+ "identity:hasPermission()",
"identity:hasRole",
- "identity:hasRole(arg0)",
+ "identity:hasRole()",
"identity:jaasConfigName",
"identity:loggedIn",
"identity:login",
@@ -108,7 +107,7 @@
"identity:principal",
"identity:rememberMe",
"identity:removeRole",
- "identity:removeRole(arg0)",
+ "identity:removeRole()",
"identity:subject",
"identity:username",
"image",
13 years, 8 months
JBoss Tools SVN: r25945 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-10-20 10:15:32 -0400 (Wed, 20 Oct 2010)
New Revision: 25945
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
Log:
https://jira.jboss.org/browse/JBIDE-7374
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-10-20 13:09:36 UTC (rev 25944)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamCoreValidator.java 2010-10-20 14:15:32 UTC (rev 25945)
@@ -28,6 +28,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jdt.core.Flags;
+import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IMember;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -687,7 +688,12 @@
try {
IProject p = seamProject.getProject();
// type = EclipseJavaUtil.findType(EclipseResourceUtil.getJavaProject(p), className);
- type = EclipseResourceUtil.getJavaProject(p).findType(className);
+ IJavaProject javaProject = EclipseResourceUtil.getJavaProject(p);
+ if(javaProject==null) {
+ SeamCorePlugin.getDefault().logWarning("Can't get Java project for " + seamProject.getProject()!=null?seamProject.getProject().getName():"" + " Seam project.");
+ return;
+ }
+ type = javaProject.findType(className);
if(type==null) {
// Mark wrong class name
ITextSourceReference location = ((SeamComponentDeclaration)declaration).getLocationFor(ISeamXmlComponentDeclaration.CLASS);
13 years, 8 months
JBoss Tools SVN: r25944 - in trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui: reporting and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-20 09:09:36 -0400 (Wed, 20 Oct 2010)
New Revision: 25944
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard.java
Log:
JBDS-1206
https://jira.jboss.org/browse/JBDS-1206
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java 2010-10-20 12:50:35 UTC (rev 25943)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java 2010-10-20 13:09:36 UTC (rev 25944)
@@ -30,4 +30,5 @@
public static String REPORT_PROBLEM_DESCRIPTION;
public static String REPORT_PROBLEM_NO_DESCRIPTION;
public static String REPORT_PROBLEM_RESULT;
+ public static String REPORT_PROBLEM_COPY_BUTTON;
}
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties 2010-10-20 12:50:35 UTC (rev 25943)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties 2010-10-20 13:09:36 UTC (rev 25944)
@@ -7,4 +7,5 @@
REPORT_PROBLEM_DESCRIPTION=This wizard takes the description and info below and in addition collects various logs from eclipse and creates a zipped file which can be attached to issues or emails when reporting problems.
REPORT_PROBLEM_NO_DESCRIPTION=Description must be set.
-REPORT_PROBLEM_RESULT=Logs and your entered information have been gathered and stored at: \n{0},\n now attach this to your issue or email discussing the problem.
\ No newline at end of file
+REPORT_PROBLEM_RESULT=Logs and your entered information have been gathered and stored at: \n{0},\n now attach this to your issue or email discussing the problem.
+REPORT_PROBLEM_COPY_BUTTON=Copy path to clipboard
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard.java 2010-10-20 12:50:35 UTC (rev 25943)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard.java 2010-10-20 13:09:36 UTC (rev 25944)
@@ -42,6 +42,9 @@
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.Clipboard;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionEvent;
@@ -565,9 +568,29 @@
}
private void showConfirmDialog() {
- String filename = logFileName.getText();
+ final String filename = logFileName.getText();
String message = NLS.bind(UIMessages.REPORT_PROBLEM_RESULT, filename);
- MessageDialog.openInformation(problemDescription.getShell(), "Info", message);
+
+ MessageDialog dialog = new MessageDialog(problemDescription.getShell(),
+ "Info",
+ null,
+ message,
+ MessageDialog.INFORMATION,
+ new String[]{UIMessages.REPORT_PROBLEM_COPY_BUTTON, "Close"},
+ 1) {
+ protected void buttonPressed(int buttonId) {
+ if(buttonId == 0) {
+ Clipboard clipboard= new Clipboard(problemDescription.getShell().getDisplay());
+ try {
+ clipboard.setContents(new String[] { filename }, new Transfer[] { TextTransfer.getInstance() });
+ } finally {
+ clipboard.dispose();
+ }
+ }
+ super.buttonPressed(buttonId);
+ }
+ };
+ dialog.open();
}
private String formatContent(String content) {
13 years, 8 months
JBoss Tools SVN: r25942 - in trunk/deltacloud/tests/org.jboss.tools.deltacloud.test: gems and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-20 08:46:23 -0400 (Wed, 20 Oct 2010)
New Revision: 25942
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/pom.xml
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/settings.xml
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/main/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/main/java/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/test/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/test/java/
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/test/java/bootstrap_test.rb
Log:
temp attempt on ruby gem pom
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/pom.xml
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/pom.xml (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/pom.xml 2010-10-20 12:46:23 UTC (rev 25942)
@@ -0,0 +1,351 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <!-- <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>5</version>
+ <relativePath></relativePath>
+ </parent> -->
+
+ <groupId>org.jboss.tools.deltacloud.runtime</groupId>
+ <artifactId>deltacloud-runtime</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Delta Cloud Runtime</name>
+
+ <description>
+ POM for trying to get Delta Cloud running with jruby
+ </description>
+
+ <profiles>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <distributionManagement>
+ <repository>
+ <id>torquebox.release.repository</id>
+ <name>TorqueBox Release Repository</name>
+ <url>scpexe://repository.torquebox.org/opt/torquebox/repository/maven2/releases</url>
+ </repository>
+ <snapshotRepository>
+ <id>torquebox.snapshot.repository</id>
+ <name>TorqueBox Snapshot Repository</name>
+ <url>scpexe://repository.torquebox.org/opt/torquebox/repository/maven2/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+ </profile>
+ </profiles>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ <version>${version.jruby}</version>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>rspec</artifactId>
+ <version>${version.rspec}</version>
+ <type>gem</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>rake</artifactId>
+ <version>${version.rake}</version>
+ <type>gem</type>
+ </dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>rubyzip</artifactId>
+ <version>${version.rubyzip}</version>
+ <type>gem</type>
+ </dependency>
+
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>steamcannon-deltacloud-core</artifactId>
+ <type>gem</type>
+ </dependency>
+
+ <!-- <dependency>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-bin</artifactId>
+ <version>${version.jruby}</version>
+ <type>zip</type>
+ </dependency>
+ -->
+ </dependencies>
+ </dependencyManagement>
+
+ <properties>
+<!-- this was 0.22 before, but no avail from main repo -->
+ <version.jruby-maven-plugins>0.22.0</version.jruby-maven-plugins>
+ <version.junit>4.7</version.junit>
+ <version.jmock>2.5.1</version.jmock>
+ <version.mockito>1.8.4</version.mockito>
+ <version.hamcrest>1.1</version.hamcrest>
+
+ <version.jboss.reloaded>0.1.2</version.jboss.reloaded>
+
+ <version.jruby>1.5.3</version.jruby>
+ <version.snakeyaml>1.5</version.snakeyaml>
+ <version.rack>1.1.0</version.rack>
+
+ <version.rails2>2.3.8</version.rails2>
+ <version.rails3>3.0.0</version.rails3>
+
+ <version.ar.jdbc>0.9.7</version.ar.jdbc>
+ <version.ar.sqlite3>0.9.7</version.ar.sqlite3>
+ <version.ar.mysql>0.9.7</version.ar.mysql>
+ <version.ar.postgresql>0.9.7</version.ar.postgresql>
+
+ <version.jdbc.sqlite3>3.6.3.054</version.jdbc.sqlite3>
+ <version.jdbc.mysql>5.0.4</version.jdbc.mysql>
+ <version.jdbc.postgresql>8.4.701</version.jdbc.postgresql>
+
+ <version.rake>0.8.7</version.rake>
+ <version.rubyzip>0.9.4</version.rubyzip>
+ <version.rspec>1.3.0</version.rspec>
+
+ <version.jbossas>6.0.0.20100911-M5</version.jbossas>
+ <version.jbossas.package>6.0.x</version.jbossas.package>
+ <version.jbossmc>2.2.0.Alpha6</version.jbossmc>
+
+ <version.hornetq>2.0.0.GA</version.hornetq>
+ <version.netty>3.1.5.GA</version.netty>
+ <version.jms>1.1</version.jms>
+
+ <cxf.version>2.2.3</cxf.version>
+
+ <mobicents.sip.version>1.0</mobicents.sip.version>
+ <mobicents.spec.version>1.1.10</mobicents.spec.version>
+
+ </properties>
+
+ <repositories>
+ <repository>
+ <id>rubygems-proxy</id>
+ <name>Rubygems Proxy</name>
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <!-- Plugin Repositories -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>sonatype-snapshots</id>
+ <name>Sonatype Snapshots Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.rb</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>gem-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <commitByProject>true</commitByProject>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <configuration>
+ <instrumentation>
+ <includes>
+ <include>org/torquebox/**/*.class</include>
+ </includes>
+ </instrumentation>
+ <formats>
+ <format>html</format>
+ <format>xml</format>
+ </formats>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.sonar</groupId>
+ <artifactId>sonar-maven3-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.maven.plugins</groupId>
+ <artifactId>maven-jdocbook-plugin</artifactId>
+ <!--<version>2.1.2</version>-->
+ <version>2.3.3</version>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <followSymLinks>false</followSymLinks>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
+ <configuration>
+ <stylesheetfile>${project.build.directory}/site/apidocs/stylesheet.css</stylesheetfile>
+ <docfilessubdirs>true</docfilessubdirs>
+ <resourcesArtifacts>
+ <resourcesArtifact>
+ <groupId>org.torquebox</groupId>
+ <artifactId>torquebox-javadoc-support</artifactId>
+ <version>${project.version}</version>
+ </resourcesArtifact>
+ </resourcesArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>gem-maven-plugin</artifactId>
+ <version>${version.jruby-maven-plugins}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <jrubyVersion>${version.jruby}</jrubyVersion>
+ <jrubyArgs>-Xmx768m</jrubyArgs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>jruby-maven-plugin</artifactId>
+ <version>${version.jruby-maven-plugins}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <jrubyVersion>${version.jruby}</jrubyVersion>
+ <jrubyArgs>-Xmx768m</jrubyArgs>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>rake-maven-plugin</artifactId>
+ <version>${version.jruby-maven-plugins}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <jrubyVersion>${version.jruby}</jrubyVersion>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>rspec-maven-plugin</artifactId>
+ <version>${version.jruby-maven-plugins}</version>
+ <executions>
+ <execution>
+ <id>run-specs</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <inherit>true</inherit>
+ <jrubyVersion>${version.jruby}</jrubyVersion>
+ <gemHome>${project.build.directory}/rubygems</gemHome>
+ <gemPath>${project.build.directory}/rubygems</gemPath>
+ <fork>true</fork>
+ <systemProperties>
+ <property>
+ <name>log4j.configuration</name>
+ <value>test-log4j.xml</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/settings.xml
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/settings.xml (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/settings.xml 2010-10-20 12:46:23 UTC (rev 25942)
@@ -0,0 +1,50 @@
+
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+ <profiles>
+ <profile>
+ <id>jboss-public-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>http://repository.jboss.org/nexus/content/groups/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+
+ <activeProfiles>
+ <activeProfile>jboss-public-repository</activeProfile>
+ </activeProfiles>
+
+</settings>
+
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/test/java/bootstrap_test.rb
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/test/java/bootstrap_test.rb (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/gems/src/test/java/bootstrap_test.rb 2010-10-20 12:46:23 UTC (rev 25942)
@@ -0,0 +1,20 @@
+require 'rubygems'
+#require 'deltacloud-dependencies.jar'
+require 'deltacloud-dependencies.jar'
+#require 'steamcannon-deltacloud-core'
+
+# Force Rubygems to reload the gem paths
+Gem.clear_paths
+
+version = ">= 0"
+
+if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
+ version = $1
+ ARGV.shift
+end
+
+ARGV[0] = "-i mock"
+
+load Gem.bin_path('steamcannon-deltacloud-core', 'deltacloudd', version)
+
+
13 years, 8 months