JBoss Tools SVN: r21004 - in trunk/jsf/docs/userguide/en-US: images/editors_features and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2010-03-24 10:33:44 -0400 (Wed, 24 Mar 2010)
New Revision: 21004
Added:
trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_11a.png
Modified:
trunk/jsf/docs/userguide/en-US/editors.xml
Log:
<html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif">
<p>https://jira.jboss.org/jira/browse/JBDS-1012 - added info about descriptions in CA. </p>
</body></html>
Modified: trunk/jsf/docs/userguide/en-US/editors.xml
===================================================================
--- trunk/jsf/docs/userguide/en-US/editors.xml 2010-03-24 14:05:34 UTC (rev 21003)
+++ trunk/jsf/docs/userguide/en-US/editors.xml 2010-03-24 14:33:44 UTC (rev 21004)
@@ -432,8 +432,19 @@
</imageobject>
</mediaobject>
</figure>
- <para>Also, as you can see, the ranking and sorting are available in EL code
- completions.</para>
+ <para>Also the ranking and sorting are available in EL code
+ completions.</para>
+ <para>As you can see, together with proposals content assist also provides descriptions
+ of selected tags or attributes.</para>
+ <figure>
+ <title>Tag description</title>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/editors_features/editors_features_11a.png"
+ />
+ </imageobject>
+ </mediaobject>
+ </figure>
<section id="JSFProjectFiles3087">
<title>JSF Project Files</title>
<para>When working with JSF project in JBoss Developer Studio, you can use various
@@ -488,6 +499,7 @@
</imageobject>
</mediaobject>
</figure>
+
</section>
<section id="ContentAssistforCompositeComponents">
<title>Content Assist for Composite Components</title>
Added: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_11a.png
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_11a.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years
JBoss Tools SVN: r21003 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-03-24 10:05:34 -0400 (Wed, 24 Mar 2010)
New Revision: 21003
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6097
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-03-24 14:02:28 UTC (rev 21002)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-03-24 14:05:34 UTC (rev 21003)
@@ -197,11 +197,11 @@
if (subclass instanceof JoinedSubclass) {
((JoinedSubclass) subclass).setTable(new Table(pastClass.getClassName().toUpperCase()));
((JoinedSubclass) subclass).setKey((KeyValue) pc.getIdentifierProperty().getValue());
- } else {
- if (pastClass.getIdentifierProperty() != null) {
- subclass.addProperty(pastClass.getIdentifierProperty());
- }
}
+ if (pastClass.getIdentifierProperty() != null) {
+ subclass.addProperty(pastClass.getIdentifierProperty());
+ }
+
Iterator it = pastClass.getPropertyIterator();
while (it.hasNext()) {
subclass.addProperty((Property) it.next());
16 years
JBoss Tools SVN: r21002 - trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-03-24 10:02:28 -0400 (Wed, 24 Mar 2010)
New Revision: 21002
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6051
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-03-24 09:49:39 UTC (rev 21001)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-03-24 14:02:28 UTC (rev 21002)
@@ -261,6 +261,8 @@
*/
protected EntityInfo entityInfo;
+ private TypeDeclaration currentType;
+
TypeVisitor typeVisitor;
public void setEntities(Map<String, EntityInfo> entities) {
@@ -297,6 +299,7 @@
@SuppressWarnings("unchecked")
public boolean visit(TypeDeclaration node) {
+ currentType = node;
if ("".equals(entityInfo.getPrimaryIdName())){ //$NON-NLS-1$
//try to guess id
FieldDeclaration[] fields = node.getFields();
@@ -354,7 +357,9 @@
if (prop == null) {
continue;
}
-
+ if (!varHasGetterAndSetter(var)){
+ prop.setPropertyAccessorName("field"); //$NON-NLS-1$
+ }
String name = var.getName().getIdentifier();
if (name.equals(primaryIdName)) {
rootClass.setIdentifierProperty(prop);
@@ -366,6 +371,28 @@
return true;
}
+ private boolean varHasGetterAndSetter(VariableDeclarationFragment var){
+ String name = var.getName().getIdentifier();
+ String setterName = "set" + Character.toUpperCase(name.charAt(0)) + name.substring(1); //$NON-NLS-1$
+ String getterName = "get" + Character.toUpperCase(name.charAt(0)) + name.substring(1); //$NON-NLS-1$
+ String getterName2 = null;
+ Type varType = ((FieldDeclaration)var.getParent()).getType();
+ if (varType.isPrimitiveType()
+ && ((PrimitiveType)varType).getPrimitiveTypeCode() == PrimitiveType.BOOLEAN){
+ getterName2 = "is" + Character.toUpperCase(name.charAt(0)) + name.substring(1); //$NON-NLS-1$
+ }
+ boolean setterFound = false, getterFound = false;
+ MethodDeclaration[] mds = currentType.getMethods();
+ for (MethodDeclaration methodDeclaration : mds) {
+ String methodName = methodDeclaration.getName().getIdentifier();
+ if (methodName.equals(setterName)) setterFound = true;
+ if (methodName.equals(getterName)) getterFound = true;
+ if (methodName.equals(getterName2)) getterFound = true;
+ if (setterFound && getterFound) return true;
+ }
+ return false;
+ }
+
@Override
public boolean visit(MethodDeclaration node) {
if (!entityInfo.isInterfaceFlag()) return super.visit(node);
@@ -404,7 +431,7 @@
protected Property createProperty(String varName, Type varType) {
typeVisitor.init(varName, entityInfo);
varType.accept(typeVisitor);
- Property p = typeVisitor.getProperty();
+ Property p = typeVisitor.getProperty();
return p;
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-03-24 09:49:39 UTC (rev 21001)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/NewHibernateMappingFileWizard.java 2010-03-24 14:02:28 UTC (rev 21002)
@@ -299,7 +299,6 @@
for (Entry<IJavaProject, Configuration> entry : configs.entrySet()) {
Configuration config = entry.getValue();
HibernateMappingGlobalSettings hmgs = new HibernateMappingGlobalSettings();
- hmgs.setDefaultAccess("field"); //$NON-NLS-1$
//final IPath projPath = entry.getKey().getProject().getLocation();
IPath place2Gen = previewPage.getRootPlace2Gen().append(entry.getKey().getElementName());
16 years
JBoss Tools SVN: r21001 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-03-24 05:49:39 -0400 (Wed, 24 Mar 2010)
New Revision: 21001
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesTableViewer.java
Log:
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesTableViewer.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesTableViewer.java 2010-03-24 07:14:38 UTC (rev 21000)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/composite/TagAttributesTableViewer.java 2010-03-24 09:49:39 UTC (rev 21001)
@@ -1,3 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2010 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+
package org.jboss.tools.common.model.ui.editors.dnd.composite;
import org.eclipse.jface.viewers.CellEditor;
@@ -18,6 +29,12 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
+/**
+ *
+ * @author yzhishko
+ *
+ */
+
public class TagAttributesTableViewer extends TableViewer {
private boolean isHandle = true;
private boolean isTraversed = false;
16 years
JBoss Tools SVN: r21000 - in trunk/esb/tests/org.jboss.tools.esb.project.core.test: projects and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2010-03-24 03:14:38 -0400 (Wed, 24 Mar 2010)
New Revision: 21000
Added:
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.classpath
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.project
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.settings/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.settings/org.eclipse.jdt.core.prefs
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/bin/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/src/
Modified:
trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java
Log:
JBIDE-5572: add unit tests for ESB, related to user customized ESB runtime classpath container
Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-03-23 23:18:39 UTC (rev 20999)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-03-24 07:14:38 UTC (rev 21000)
@@ -14,4 +14,10 @@
org.jboss.tools.common.test;bundle-version="2.0.0",
org.eclipse.jdt.core;bundle-version="3.5.0",
org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
- org.eclipse.jdt.launching;bundle-version="3.5.0"
+ org.eclipse.jdt.launching;bundle-version="3.5.0",
+ org.eclipse.wst.common.frameworks;bundle-version="1.1.300",
+ org.jboss.tools.esb.project.ui;bundle-version="1.0.0",
+ org.eclipse.jst.common.frameworks;bundle-version="1.1.300",
+ org.eclipse.core.commands;bundle-version="3.5.0",
+ org.eclipse.jst.j2ee;bundle-version="1.1.300",
+ org.jboss.ide.eclipse.as.classpath.core;bundle-version="2.1.0"
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.classpath
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.classpath (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.classpath 2010-03-24 07:14:38 UTC (rev 21000)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.project
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.project (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.project 2010-03-24 07:14:38 UTC (rev 21000)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>esbTestProject_2</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject_2/.settings/org.eclipse.jdt.core.prefs 2010-03-24 07:14:38 UTC (rev 21000)
@@ -0,0 +1,12 @@
+#Thu Mar 18 14:11:02 CST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2010-03-23 23:18:39 UTC (rev 20999)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2010-03-24 07:14:38 UTC (rev 21000)
@@ -1,11 +1,11 @@
package org.jboss.tools.esb.project.core.test;
import java.io.File;
-import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import junit.framework.TestCase;
@@ -14,10 +14,17 @@
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.core.IClasspathEntry;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.JavaCore;
+import org.eclipse.jdt.internal.core.JavaProject;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IFacetedProject;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
@@ -43,6 +50,12 @@
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.esb.core.ESBProjectConstant;
+import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties;
+import org.jboss.tools.esb.core.facet.JBossClassPathCommand;
+import org.jboss.tools.esb.core.facet.JBossESBFacetDataModelProvider;
+import org.jboss.tools.esb.core.runtime.JBossESBRuntime;
+import org.jboss.tools.esb.core.runtime.JBossRuntimeClassPathInitializer;
+import org.jboss.tools.esb.core.runtime.JBossRuntimeManager;
public class ESBProjectDeploymentTest extends TestCase {
public static final IVMInstall VM_INSTALL = JavaRuntime
@@ -63,6 +76,10 @@
public static final String SERVER_SOAP50_HOME = System.getProperty(
"jbosstools.test.soap.home.5.0",
"/home/fugang/jboss-all/jboss-soa-p.5.0.0") + "//jboss-as";
+
+ static String userCustomizedESBRuntime = "UserCustomizedESBRuntime";
+
+ private JBossRuntimeManager jrm = JBossRuntimeManager.getInstance();
static String BUNDLE = "org.jboss.tools.esb.project.core.test";
IProject project;
@@ -71,17 +88,31 @@
private IRuntime currentRuntime;
private IServer currentServer;
+ private JBossESBRuntime jer;
+
@Override
protected void setUp() throws Exception {
super.setUp();
soap50_runtime = createRuntime(IJBossToolingConstants.EAP_50,
SERVER_SOAP50_HOME, "default");
+
+ jer = new JBossESBRuntime();
+ jer.setName(userCustomizedESBRuntime);
+ jer.setConfiguration("default");
+ jer.setDefault(true);
+ jer.setHomeDir(SERVER_SOAP50_HOME);
+ jer.setVersion("4.7");
+ jrm.addRuntime(jer);
+ jrm.save();
}
@Override
protected void tearDown() throws Exception {
super.tearDown();
+
+ jrm.removeRuntime(jer);
+ jrm.save();
soap50_runtime.delete();
if (project != null) {
project.delete(true, null);
@@ -131,7 +162,41 @@
}
}
+
+ public void testUserCustomizedESBRuntime() throws Exception{
+// project = createESBProject("esbTestProject_2");
+ TestProjectProvider provider = new TestProjectProvider(BUNDLE,
+ "/projects/esbTestProject_2" , "esbTestProject_2", true);
+ project = provider.getProject();
+ IDataModel model = DataModelFactory.createDataModel(new JBossESBFacetDataModelProvider());
+ model.setBooleanProperty(IJBossESBFacetDataModelProperties.RUNTIME_IS_SERVER_SUPPLIED, false);
+ model.setStringProperty(IJBossESBFacetDataModelProperties.RUNTIME_ID, jer.getName());
+ model.setStringProperty(IJBossESBFacetDataModelProperties.RUNTIME_HOME, jer.getHomeDir());
+ model.setStringProperty(IJBossESBFacetDataModelProperties.ESB_CONTENT_FOLDER, "esbcontent");
+
+ JBossClassPathCommand jcc = new JBossClassPathCommand(project, model);
+ IStatus status = jcc.executeOverride(null);
+
+ assertEquals("Failed to add User Customized ESB runtime classpath container.", IStatus.OK, status.getSeverity());
+
+ IJavaProject jproject = JavaCore.create(project);
+
+ JBossRuntimeClassPathInitializer initializer = new JBossRuntimeClassPathInitializer();
+ IPath path = new Path("org.jboss.esb.runtime.classpath/UserCustomizedESBRuntime");
+ initializer.initialize(path, jproject);
+
+ IClasspathEntry[] entry = initializer.getEntries(path);//jproject.getRawClasspath();
+ List<String> jars = new ArrayList<String>();
+
+ for(IClasspathEntry ent :entry){
+ jars.add(ent.getPath().lastSegment());
+ }
+
+ assertEquals("unalbe to read User customized ESB runtime, jbossesb-rosetta.jar is not in classpath.", true, jars.contains("jbossesb-rosetta.jar"));
+
+ }
+
public void testSOAP50Deployment() throws Exception {
testESBDeployment(IJBossToolingConstants.EAP_50,
IJBossToolingConstants.SERVER_EAP_50, SERVER_SOAP50_HOME);
16 years
JBoss Tools SVN: r20999 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-23 19:18:39 -0400 (Tue, 23 Mar 2010)
New Revision: 20999
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
Log:
add missing bundle deps
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2010-03-23 22:46:36 UTC (rev 20998)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 2010-03-23 23:18:39 UTC (rev 20999)
@@ -16,6 +16,8 @@
org.apache.ant,
org.jboss.tools.jmx.core,
org.eclipse.core.variables,
+ org.eclipse.jem.util,
+ org.eclipse.wst.common.emfworkbench.integration,
org.jboss.ide.eclipse.as.wtp.core,
org.eclipse.wst.common.project.facet.core,
org.eclipse.wst.common.frameworks,
16 years
JBoss Tools SVN: r20998 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-23 18:46:36 -0400 (Tue, 23 Mar 2010)
New Revision: 20998
Modified:
trunk/genpom.scala
Log:
make directory path relative
Modified: trunk/genpom.scala
===================================================================
--- trunk/genpom.scala 2010-03-23 22:45:32 UTC (rev 20997)
+++ trunk/genpom.scala 2010-03-23 22:46:36 UTC (rev 20998)
@@ -11,7 +11,7 @@
def main(args: Array[String]) {
- generateAggregator(new File("/home/nboldt/11/jbosstools-trunk"),
+ generateAggregator(new File("."),
new File("parent-pom.xml"),
GVA("org.jboss.tools", "org.jboss.tools.parent.pom", "0.0.1-SNAPSHOT"),
GVA("org.jboss.tools", "trunk", "0.0.1-SNAPSHOT")
16 years
JBoss Tools SVN: r20997 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-23 18:45:32 -0400 (Tue, 23 Mar 2010)
New Revision: 20997
Modified:
trunk/genpom.scala
Log:
switch from .qualifier to -SNAPSHOT
Modified: trunk/genpom.scala
===================================================================
--- trunk/genpom.scala 2010-03-23 22:17:38 UTC (rev 20996)
+++ trunk/genpom.scala 2010-03-23 22:45:32 UTC (rev 20997)
@@ -11,7 +11,7 @@
def main(args: Array[String]) {
- generateAggregator(new File("/Users/max/Documents/code/jbosstools/trunk"),
+ generateAggregator(new File("/home/nboldt/11/jbosstools-trunk"),
new File("parent-pom.xml"),
GVA("org.jboss.tools", "org.jboss.tools.parent.pom", "0.0.1-SNAPSHOT"),
GVA("org.jboss.tools", "trunk", "0.0.1-SNAPSHOT")
@@ -69,11 +69,11 @@
val lines = Source.fromFile(mf).getLines
for(l <- lines)
if(l.contains("Bundle-Version:")) {
- return l.substring("Bundle-Version:".length()).trim()
+ return l.substring("Bundle-Version:".length()).trim().replaceAll("\\.qualifier","-SNAPSHOT")
}
} else if (featurexml.exists()) {
val data = XML.loadFile(featurexml)
- return (data \ "@version").text
+ return (data \ "@version").text.replaceAll("\\.qualifier","-SNAPSHOT")
}
return dir + " " + featurexml.exists() + " " + mf.exists()
}
16 years
JBoss Tools SVN: r20996 - trunk.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2010-03-23 18:17:38 -0400 (Tue, 23 Mar 2010)
New Revision: 20996
Modified:
trunk/parent-pom.xml
Log:
tycho 0.8.0
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-03-23 21:45:59 UTC (rev 20995)
+++ trunk/parent-pom.xml 2010-03-23 22:17:38 UTC (rev 20996)
@@ -8,7 +8,7 @@
<packaging>pom</packaging>
<properties>
- <tychoVersion>0.7.0</tychoVersion>
+ <tychoVersion>0.8.0</tychoVersion>
</properties>
<build>
@@ -19,17 +19,28 @@
<version>${tychoVersion}</version>
<extensions>true</extensions>
</plugin>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tychoVersion}</version>
- <configuration>
- <resolver>p2</resolver>
- </configuration>
- </plugin>
+
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tychoVersion}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <environments>
+
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
+
<repositories>
<repository>
<id>galileo</id>
@@ -42,6 +53,17 @@
<enabled>true</enabled>
</releases>
</repository>
+
+
</repositories>
+<pluginRepositories>
+ <pluginRepository>
+ <id>tycho</id>
+ <url>http://repository.sonatype.org/content/repositories/all-001//</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
</project>
16 years
JBoss Tools SVN: r20995 - trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-03-23 17:45:59 -0400 (Tue, 23 Mar 2010)
New Revision: 20995
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF/MANIFEST.MF
Log:
Manifest-Version: 1.0
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF/MANIFEST.MF 2010-03-23 20:50:50 UTC (rev 20994)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/META-INF/MANIFEST.MF 2010-03-23 21:45:59 UTC (rev 20995)
@@ -1,3 +1,4 @@
+Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.jmx.core;singleton:=true
16 years