JBoss Tools SVN: r23416 - in trunk: jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model and 1 other directories.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2010-07-15 10:08:27 -0400 (Thu, 15 Jul 2010)
New Revision: 23416
Added:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/MessagesFileRenameParticipant.java
trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
Log:
https://jira.jboss.org/browse/JBIDE-4858
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java 2010-07-15 11:12:29 UTC (rev 23415)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolution.java 2010-07-15 14:08:27 UTC (rev 23416)
@@ -51,6 +51,14 @@
List<ELSegment> findSegmentsByJavaElement(IJavaElement element);
/**
+ * Finds the segments which are resolved to given baseName and propertyName.
+ * @param baseName
+ * @param propertyName
+ * @return
+ */
+ List<ELSegment> findSegmentsByMessageProperty(String baseName, String propertyName);
+
+ /**
* Finds the segment which is located at given offset.
* @param offcet relative source EL operand.
* @return
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2010-07-15 11:12:29 UTC (rev 23415)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELResolutionImpl.java 2010-07-15 14:08:27 UTC (rev 23416)
@@ -70,6 +70,20 @@
}
return list;
}
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentsByMessageProperty(String, String)
+ */
+ public List<ELSegment> findSegmentsByMessageProperty(String baseName, String propertyName) {
+ ArrayList<ELSegment> list = new ArrayList<ELSegment>();
+ for(ELSegment segment : segments){
+ if(segment instanceof MessagePropertyELSegment){
+ if(((MessagePropertyELSegment)segment).getBaseName().equals(baseName) && segment.getToken().getText().equals(propertyName))
+ list.add(segment);
+ }
+ }
+ return list;
+ }
/* (non-Javadoc)
* @see org.jboss.tools.common.el.core.resolver.ELResolution#findSegmentByOffset(int)
Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java 2010-07-15 14:08:27 UTC (rev 23416)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.el.core.resolver;
+
+import org.eclipse.core.resources.IResource;
+import org.jboss.tools.common.text.ITextSourceReference;
+
+/**
+ * Describes a segment of EL operand which is a Message Bundle Property.
+ * @author Daniel Azarov
+ */
+public interface MessagePropertyELSegment extends ELSegment {
+ /**
+ * @return qualified name of property file.
+ */
+ String getBaseName();
+
+ /**
+ * @return resource of Message Bundle.
+ */
+ IResource getMessageBundleResource();
+
+ /**
+ * @return true if the segment presents message property.
+ */
+ boolean isProperty();
+
+ /**
+ * @return source reference of message property.
+ */
+ ITextSourceReference getMessagePropertySourceReference();
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2010-07-15 14:08:27 UTC (rev 23416)
@@ -0,0 +1,68 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.el.core.resolver;
+
+import org.eclipse.core.resources.IResource;
+import org.jboss.tools.common.text.ITextSourceReference;
+
+/**
+ * @author Daniel Azarov
+ */
+public class MessagePropertyELSegmentImpl extends ELSegmentImpl implements
+ MessagePropertyELSegment {
+
+ private IResource messageBundleResource = null;
+ private ITextSourceReference messagePropertySourceReference = null;
+ private int propertyStart=0, propertyLength=0;
+ private String baseName=null;
+
+ @Override
+ public IResource getMessageBundleResource() {
+ return messageBundleResource;
+ }
+
+ public void setMessageBundleResource(IResource resource){
+ messageBundleResource = resource;
+ }
+
+ @Override
+ public boolean isProperty() {
+ return messagePropertySourceReference != null;
+ }
+
+ @Override
+ public ITextSourceReference getMessagePropertySourceReference() {
+ if(messagePropertySourceReference==null) {
+ messagePropertySourceReference = new ITextSourceReference() {
+ public int getStartPosition() {
+ return propertyStart;
+ }
+ public int getLength() {
+ return propertyLength;
+ }
+ };
+ }
+ return messagePropertySourceReference;
+ }
+
+ public void setMessagePropertySourceReference(int start, int lenght) {
+ propertyStart = start;
+ propertyLength = lenght;
+ }
+
+ public String getBaseName(){
+ return baseName;
+ }
+
+ public void setBaseName(String name){
+ baseName = name;
+ }
+}
Property changes on: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2010-07-15 11:12:29 UTC (rev 23415)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2010-07-15 14:08:27 UTC (rev 23416)
@@ -19,9 +19,12 @@
import java.util.TreeSet;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ca.AbstractELCompletionEngine;
import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.model.ELInstance;
@@ -37,11 +40,15 @@
import org.jboss.tools.common.el.core.resolver.ELResolutionImpl;
import org.jboss.tools.common.el.core.resolver.ELSegmentImpl;
import org.jboss.tools.common.el.core.resolver.IVariable;
+import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegmentImpl;
import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo;
import org.jboss.tools.common.model.XModel;
+import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.text.TextProposal;
+import org.jboss.tools.common.text.ext.util.Utils;
+import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jsf.JSFModelPlugin;
import org.jboss.tools.jst.web.kb.IPageContext;
import org.jboss.tools.jst.web.kb.IResourceBundle;
@@ -334,7 +341,9 @@
ELSegmentImpl segment = new ELSegmentImpl();
resolution.setProposals(kbProposals);
if(expr instanceof ELPropertyInvocation) {
- segment.setToken(((ELPropertyInvocation)expr).getName());
+ segment = new MessagePropertyELSegmentImpl();
+ segment.setToken(((ELPropertyInvocation)expr).getName());
+ processMessagePropertySegment(expr, (MessagePropertyELSegmentImpl)segment, members);
} else {
segment.setToken(expr.getFirstToken());
}
@@ -444,7 +453,50 @@
resolution.setLastResolvedToken(expr);
}
}
-
+
+ private void processMessagePropertySegment(ELInvocationExpression expr, MessagePropertyELSegmentImpl segment, List<Variable> variables){
+ for(Variable variable : variables){
+ if(expr.getFirstToken().getText().equals(variable.name)){
+
+ IModelNature n = EclipseResourceUtil.getModelNature(variable.f.getProject());
+ if(n == null)
+ return;
+ XModel model = n.getModel();
+ if(model == null)
+ return;
+ XModelObject properties = model.getByPath("/" + variable.basename.replace('.', '/') + ".properties");
+ if(properties == null)
+ return;
+ IFile propFile = (IFile)properties.getAdapter(IFile.class);
+ if(propFile == null)
+ return;
+ segment.setMessageBundleResource(propFile);
+ XModelObject property = properties.getChildByPath(expr.getText());
+ if(property != null){
+ try {
+ String content = FileUtil.readStream(propFile);
+ if(findPropertyLocation(property, content, segment)){
+ segment.setBaseName(variable.basename);
+ }
+ } catch (CoreException e) {
+ log(e);
+ }
+ }
+ }
+ }
+ }
+
+ public boolean findPropertyLocation(XModelObject property, String content, MessagePropertyELSegmentImpl segment) {
+ String name = property.getAttributeValue("name"); //$NON-NLS-1$
+ String nvs = property.getAttributeValue("name-value-separator"); //$NON-NLS-1$
+ int i = content.indexOf(name + nvs);
+ if(i < 0) return false;
+ int j = content.indexOf('\n', i);
+ if(j < 0) j = content.length();
+ segment.setMessagePropertySourceReference(i, j - i);
+ return true;
+ }
+
protected void processSingularMember(Variable mbr, Set<TextProposal> kbProposals) {
// Surround the "long" keys containing the dots with [' ']
TreeSet<String> keys = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/MessagesFileRenameParticipant.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/MessagesFileRenameParticipant.java 2010-07-15 11:12:29 UTC (rev 23415)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/el/refactoring/MessagesFileRenameParticipant.java 2010-07-15 14:08:27 UTC (rev 23416)
@@ -55,7 +55,11 @@
newName = "\""+oldName.replace(fileName,newName)+"\"";
SearchUtil su = new SearchUtil(SearchUtil.XML_FILES, oldName);
+
SearchResult result = su.searchInNodeAttribute(file.getProject(), ":loadBundle", "basename");
+ if(result.getEntries().size() == 0)
+ return false;
+
for(FileResult fr : result.getEntries()){
TextFileChange fileChange = new TextFileChange(fr.getFile().getName(), fr.getFile());
MultiTextEdit root = new MultiTextEdit();
15 years, 9 months
JBoss Tools SVN: r23414 - branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/command.
by jbosstools-commits@lists.jboss.org
Author: tfennelly
Date: 2010-07-15 04:33:05 -0400 (Thu, 15 Jul 2010)
New Revision: 23414
Modified:
branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/command/CommandTest.java
Log:
removed dependency on the org.junit.Assert class
Modified: branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/command/CommandTest.java
===================================================================
--- branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/command/CommandTest.java 2010-07-15 08:05:41 UTC (rev 23413)
+++ branches/smooks-dmb/tests/org.jboss.tools.smooks.model.test/src/org/jboss/tools/smooks/model/command/CommandTest.java 2010-07-15 08:33:05 UTC (rev 23414)
@@ -8,7 +8,6 @@
import org.jboss.tools.smooks.model.csv.CSVReader;
import org.jboss.tools.smooks.model.javabean.Bean;
import org.jboss.tools.smooks.model.javabean.Wiring;
-import org.junit.Assert;
/**
* @author Dart
@@ -29,10 +28,10 @@
command3.execute();
command4.execute();
- Assert.assertSame(reader.getFields(), "name,address,age");
- Assert.assertSame(reader.getRecordElementName(), "person");
- Assert.assertSame(reader.getRootElementName(), "people");
- Assert.assertSame(reader.getIndent(),true);
+ assertSame(reader.getFields(), "name,address,age");
+ assertSame(reader.getRecordElementName(), "person");
+ assertSame(reader.getRootElementName(), "people");
+ assertSame(reader.getIndent(),true);
@@ -41,20 +40,20 @@
command3.undo();
command4.undo();
- Assert.assertSame(reader.getFields(), null);
- Assert.assertSame(reader.getRecordElementName(), null);
- Assert.assertSame(reader.getRootElementName(),null);
-// Assert.assertSame(reader.getIndent(),true);
+ assertSame(reader.getFields(), null);
+ assertSame(reader.getRecordElementName(), null);
+ assertSame(reader.getRootElementName(),null);
+// assertSame(reader.getIndent(),true);
command1.redo();
command2.redo();
command3.redo();
command4.redo();
- Assert.assertSame(reader.getFields(), "name,address,age");
- Assert.assertSame(reader.getRecordElementName(), "person");
- Assert.assertSame(reader.getRootElementName(), "people");
- Assert.assertSame(reader.getIndent(),true);
+ assertSame(reader.getFields(), "name,address,age");
+ assertSame(reader.getRecordElementName(), "person");
+ assertSame(reader.getRootElementName(), "people");
+ assertSame(reader.getIndent(),true);
// reader.setFields("name,address,age");
// reader.setRootElementName("people");
@@ -67,21 +66,21 @@
Bean people = new Bean();
Wiring w = new Wiring();
- Assert.assertTrue(people.getWireBindings().isEmpty());
+ assertTrue(people.getWireBindings().isEmpty());
AddCommand c = new AddCommand(people, w, "wireBindings");
c.execute();
- Assert.assertTrue(people.getWireBindings().get(0) == w);
+ assertTrue(people.getWireBindings().get(0) == w);
c.undo();
- Assert.assertTrue(people.getWireBindings().isEmpty());
+ assertTrue(people.getWireBindings().isEmpty());
c.redo();
- Assert.assertTrue(people.getWireBindings().get(0) == w);
+ assertTrue(people.getWireBindings().get(0) == w);
}
public void testRemoveCommand(){
@@ -90,16 +89,16 @@
AddCommand c = new AddCommand(people, w, "wireBindings");
c.execute();
- Assert.assertTrue(people.getWireBindings().get(0) == w);
+ assertTrue(people.getWireBindings().get(0) == w);
RemoveCommand rc = new RemoveCommand(people, w, "wireBindings");
rc.execute();
- Assert.assertTrue(people.getWireBindings().isEmpty());
+ assertTrue(people.getWireBindings().isEmpty());
rc.undo();
- Assert.assertTrue(people.getWireBindings().get(0) == w);
+ assertTrue(people.getWireBindings().get(0) == w);
rc.redo();
- Assert.assertTrue(people.getWireBindings().isEmpty());
+ assertTrue(people.getWireBindings().isEmpty());
}
public void testUnSetCommand(){
@@ -111,26 +110,26 @@
cc.appendCommand(c1);
cc.appendCommand(c2);
cc.execute();
- Assert.assertTrue(people.getBeanId().equals("people"));
- Assert.assertTrue(people.getBeanClass().equals("java.util.ArrayList"));
+ assertTrue(people.getBeanId().equals("people"));
+ assertTrue(people.getBeanClass().equals("java.util.ArrayList"));
UnSetCommand us = new UnSetCommand(people, "beanId");
UnSetCommand us1 = new UnSetCommand(people, "beanClass");
us.execute();
us1.execute();
- Assert.assertTrue(people.getBeanId() == null);
- Assert.assertTrue(people.getBeanClass() == null);
+ assertTrue(people.getBeanId() == null);
+ assertTrue(people.getBeanClass() == null);
us.undo();
us1.undo();
- Assert.assertTrue(people.getBeanId().equals("people"));
- Assert.assertTrue(people.getBeanClass().equals("java.util.ArrayList"));
+ assertTrue(people.getBeanId().equals("people"));
+ assertTrue(people.getBeanClass().equals("java.util.ArrayList"));
us.redo();
us1.redo();
- Assert.assertTrue(people.getBeanId() == null);
- Assert.assertTrue(people.getBeanClass() == null);
+ assertTrue(people.getBeanId() == null);
+ assertTrue(people.getBeanClass() == null);
}
public void testCompositeCommand(){
@@ -146,19 +145,19 @@
cc.appendCommand(c2);
cc.execute();
- Assert.assertTrue(people.getWireBindings().get(0) == w);
- Assert.assertTrue(people.getBeanId().equals("people"));
- Assert.assertTrue(people.getBeanClass().equals("java.util.ArrayList"));
+ assertTrue(people.getWireBindings().get(0) == w);
+ assertTrue(people.getBeanId().equals("people"));
+ assertTrue(people.getBeanClass().equals("java.util.ArrayList"));
cc.undo();
- Assert.assertTrue(people.getWireBindings().isEmpty());
- Assert.assertTrue(people.getBeanId() == null);
- Assert.assertTrue(people.getBeanClass() == null);
+ assertTrue(people.getWireBindings().isEmpty());
+ assertTrue(people.getBeanId() == null);
+ assertTrue(people.getBeanClass() == null);
cc.redo();
- Assert.assertTrue(people.getWireBindings().get(0) == w);
- Assert.assertTrue(people.getBeanId().equals("people"));
- Assert.assertTrue(people.getBeanClass().equals("java.util.ArrayList"));
+ assertTrue(people.getWireBindings().get(0) == w);
+ assertTrue(people.getBeanId().equals("people"));
+ assertTrue(people.getBeanClass().equals("java.util.ArrayList"));
}
public void testCommandStatck(){
@@ -192,22 +191,22 @@
Bean people = new Bean();
Wiring w = new Wiring();
- Assert.assertTrue(people.getWireBindings().isEmpty());
+ assertTrue(people.getWireBindings().isEmpty());
SetCommand c1 = new SetCommand(people, "people", "beanId");
AddCommand c = new AddCommand(people, w, "wireBindings");
- Assert.assertTrue(!stack.canRedo()&&!stack.canUndo());
+ assertTrue(!stack.canRedo()&&!stack.canUndo());
stack.execute(c);
- Assert.assertTrue(people.getWireBindings().get(0) == w);
- Assert.assertTrue(!stack.canRedo());
+ assertTrue(people.getWireBindings().get(0) == w);
+ assertTrue(!stack.canRedo());
stack.undo();
stack.execute(c1);
stack.undo();
- Assert.assertTrue(people.getBeanId()==null);
+ assertTrue(people.getBeanId()==null);
}
}
15 years, 9 months
JBoss Tools SVN: r23413 - in trunk/documentation/whatsnew/drools: images and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dennyxu
Date: 2010-07-15 04:05:41 -0400 (Thu, 15 Jul 2010)
New Revision: 23413
Added:
trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.M1.html
trunk/documentation/whatsnew/drools/images/
trunk/documentation/whatsnew/drools/images/edit_connection.gif
trunk/documentation/whatsnew/drools/images/edit_connection_wizard.gif
Log:
commit what's new for EGT
Added: trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.M1.html
===================================================================
--- trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.M1.html (rev 0)
+++ trunk/documentation/whatsnew/drools/guvnor-tools-news-5.1.0.M1.html 2010-07-15 08:05:41 UTC (rev 23413)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css"/>
+<title>Hibernate tools 3.4.0.M1 What's New</title>
+</head>
+<body>
+<h1>Drools Guvnor 5.1.0.M1 What's New</h1>
+
+<p align="right"><a href="../index.html">< Main Index</a> <a href="../vpe/vpe-news-3.2.0.M1.html">Visual Page Editor ></a></p>
+
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ <h3>Guvnor Repository Connection </h3>
+ <hr/>
+ </td>
+ </tr>
+
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Support Updating Repository Connection</b></td>
+ <td valign="top">
+ <p>Guvnor tool provides a new wizard for updating a exist Guvnor repository connection. On the wizard, the repository location can be changed and security info as well. </p>
+
+<p><img src=images/edit_connection.gif></p>
+<p><img src=images/edit_connection_wizard.gif></p>
+
+
+ <p><small><a href="https://jira.jboss.org/browse/JBIDE-4646">Related jira</a></p>
+
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <hr/>
+ </td>
+ </tr>
+
+
+
+
+
+
+</table>
+
+</body>
+
+</html>
+
+
Added: trunk/documentation/whatsnew/drools/images/edit_connection.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/drools/images/edit_connection.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/drools/images/edit_connection_wizard.gif
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/drools/images/edit_connection_wizard.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
15 years, 9 months
JBoss Tools SVN: r23412 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits@lists.jboss.org
Author: dgeraskov
Date: 2010-07-15 02:03:44 -0400 (Thu, 15 Jul 2010)
New Revision: 23412
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java
Log:
https://jira.jboss.org/browse/JBIDE-6601
do not validate reven.xml if it isn't used
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2010-07-14 23:43:04 UTC (rev 23411)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2010-07-15 06:03:44 UTC (rev 23412)
@@ -301,7 +301,7 @@
}
}
- if(reverseEngineeringSettings.getText().trim().length()>0) {
+ if(reverseEngineeringSettings.isEnabled() && reverseEngineeringSettings.getText().trim().length()>0) {
msg = PathHelper.checkFile(reverseEngineeringSettings.getText(), HibernateConsoleMessages.CodeGenerationSettingsTab_reveng_xml_3, true);
if(msg!=null) {
updateStatus(msg);
15 years, 9 months
JBoss Tools SVN: r23411 - workspace/dgolovin/experimental-build.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-07-14 19:43:04 -0400 (Wed, 14 Jul 2010)
New Revision: 23411
Modified:
workspace/dgolovin/experimental-build/e36-wtp32.target
Log:
minor errors were fixed in experimental target
Modified: workspace/dgolovin/experimental-build/e36-wtp32.target
===================================================================
--- workspace/dgolovin/experimental-build/e36-wtp32.target 2010-07-14 23:02:31 UTC (rev 23410)
+++ workspace/dgolovin/experimental-build/e36-wtp32.target 2010-07-14 23:43:04 UTC (rev 23411)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.6"?>
-<target includeMode="feature" name="e36-wtp32-thirdparty">
+<target includeMode="feature" name="e36-wtp32">
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.maven.ide.eclipse.feature.feature.group" version="0.10.2.20100623-1649"/>
@@ -17,16 +17,10 @@
<repository location="http://download.eclipse.org/eclipse/updates/3.6"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
-<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
-<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
-<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit id="org.eclipse.birt.feature.group" version="2.6.0.v20100617-9gF727DGKb0yl9AwWxpmbo35PwQ_"/>
+<unit id="org.eclipse.datatools.enablement.sdk.feature.feature.group" version="1.8.0.v201005280400-7I97-FE9JfhXjGyyrcS_FeiNlq43"/>
<unit id="org.eclipse.zest.sdk.feature.group" version="1.2.0.v20100519-2050-679-8COKLDAKOXIEU_VWSfZdM9XR"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.6.0.v20100526-0800-7z8XFUJFMTfCWGoVuHImpms9H155"/>
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="3.2.0.v201005241510-7H7AFUIDxumQGOb7ocjUR2Pvz-28"/>
<unit id="org.eclipse.tptp.monitoring.runtime.feature.group" version="4.5.0.v201005271900-7T7X-7r1WNos_vYhsZicqkbMM"/>
<unit id="org.eclipse.tptp.platform.runtime.feature.group" version="4.7.0.v201005032111-7u84-8ksiNsksbQ6UTB7dcy3RUlT"/>
@@ -35,6 +29,7 @@
<unit id="org.eclipse.tptp.trace.runtime.feature.group" version="4.4.0.v201005032111-7H7C-7XbK_J3E9NJPSTgdcXb94"/>
<unit id="org.eclipse.jpt.feature.feature.group" version="2.3.0.v201005260000-7N7UEwFD3wTgbU_dxVnWV"/>
<unit id="org.eclipse.wst.common.fproj.feature.group" version="3.2.0.v201005290030-377A78s73533D5L355B"/>
+<unit id="org.eclipse.jst.common.fproj.enablement.jdt.feature.group" version="3.2.0.v201005241600-377A78s73533C6A6B39"/>
<unit id="org.eclipse.jst.enterprise_ui.feature.feature.group" version="3.2.0.v201005241530-7b7GHTYFSK2W9kPaFClvz0O_NQmN"/>
<unit id="org.eclipse.wst.web_ui.feature.feature.group" version="3.2.0.v201005241510-7O7CFb3EMf84nP-FHuc10NTz--M3"/>
<unit id="org.eclipse.wst.xsl.feature.feature.group" version="1.1.0.v201005241600-7S7WFAKFIpS---NRIS1pbfYBUIQ"/>
@@ -48,137 +43,162 @@
<unit id="org.eclipse.wst.server_adapters.feature.feature.group" version="3.2.0.v201005241510-51EoAkF77g8HBSc"/>
<repository location="http://download.eclipse.org/releases/helios/"/>
</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.birt.chart.feature.group" version="2.6.0.v20100617-7f9T0FQCnv7wz02TTZ0LE1"/>
+<unit id="org.eclipse.birt.osgi.runtime.sdk.feature.group" version="2.6.0.v20100617-57B-85wFdAHP-Cf8kRo1_ft1IUwD"/>
+<unit id="org.eclipse.birt.chart.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
+<unit id="org.eclipse.birt.integration.wtp.feature.group" version="2.6.0.v20100617-1315-35-7w3121172802426"/>
+<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
+</location>
+<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.0.568-dev-e36"/>
+<unit id="org.eclipse.swtbot.feature.group" version="2.0.0.568-dev-e36"/>
+<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
+</location>
</locations>
<includeBundles>
-<feature id="org.eclipse.tptp.platform.probekit"/>
+<feature id="org.eclipse.birt.osgi.runtime"/>
+<feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature"/>
+<plugin id="org.eclipse.equinox.concurrent"/>
+<feature id="org.eclipse.tptp.test.tools"/>
+<feature id="org.maven.ide.eclipse.wtp.feature"/>
+<feature id="org.eclipse.datatools.sqldevtools.data.feature"/>
+<feature id="org.eclipse.jst.server_adapters.ext.feature"/>
+<feature id="org.eclipse.wst.xml.xpath2.processor.feature"/>
+<feature id="org.eclipse.help"/>
+<feature id="org.eclipse.tptp.monitoring.runtime"/>
+<feature id="org.eclipse.emf.mapping.ui"/>
+<feature id="org.eclipse.birt.chart"/>
+<feature id="org.eclipse.tptp.monitoring.instrumentation"/>
+<feature id="org.eclipse.tptp.platform.xerces"/>
+<feature id="org.eclipse.jst.ws.jaxws.dom.feature"/>
+<feature id="org.eclipse.datatools.enablement.oda.designer.feature"/>
+<feature id="org.eclipse.tptp.trace.arm.ui"/>
+<feature id="org.eclipse.wst.xml_ui.feature"/>
+<feature id="org.eclipse.datatools.enablement.jdbc.feature"/>
+<feature id="org.eclipse.birt"/>
+<feature id="org.eclipse.emf.common.ui"/>
+<feature id="org.eclipse.wst.common_ui.feature"/>
+<feature id="org.eclipse.jst.common.fproj.enablement.jdt"/>
+<feature id="org.eclipse.datatools.enablement.msft.feature"/>
+<feature id="org.eclipse.datatools.enablement.sqlite.feature"/>
<feature id="org.eclipse.jpt.feature"/>
-<feature id="org.eclipse.jst.web_ui.feature"/>
-<feature id="org.eclipse.swtbot.eclipse"/>
-<feature id="org.eclipse.emf.databinding"/>
-<feature id="org.eclipse.wst.common_core.feature"/>
-<feature id="org.eclipse.datatools.enablement.hsqldb.feature"/>
-<feature id="org.eclipse.wst.ws_ui.feature"/>
-<feature id="org.eclipse.wst.ws_userdoc.feature"/>
-<feature id="org.eclipse.datatools.enablement.feature"/>
-<feature id="org.eclipse.tptp.platform.probekit.doc.user"/>
-<feature id="org.eclipse.jst.ws.jaxws.dom.feature"/>
-<feature id="org.eclipse.emf.mapping.ecore"/>
-<feature id="org.eclipse.jst.server_adapters.ext.feature"/>
+<feature id="org.eclipse.emf.databinding.edit"/>
+<plugin id="org.eclipse.xsd"/>
+<feature id="org.eclipse.tptp.monitoring.managedagent"/>
+<feature id="org.eclipse.datatools.sqldevtools.ddlgen.feature"/>
+<feature id="org.eclipse.datatools.connectivity.oda.designer.feature"/>
+<feature id="org.eclipse.tptp.platform.runtime"/>
+<feature id="org.eclipse.tptp.platform.trace"/>
+<feature id="org.eclipse.datatools.sqldevtools.parsers.feature"/>
+<feature id="org.eclipse.tptp.platform.report"/>
+<feature id="org.eclipse.datatools.connectivity.feature"/>
+<feature id="org.eclipse.draw2d"/>
+<feature id="org.eclipse.wst.xsl.feature"/>
+<plugin id="org.eclipse.xsd.edit"/>
+<feature id="org.eclipse.gef"/>
+<feature id="org.eclipse.jst.server_core.feature"/>
+<feature id="org.eclipse.datatools.enablement.ingres.feature"/>
<feature id="org.eclipse.emf.codegen.ecore"/>
+<feature id="org.eclipse.tptp.test.tools.junit"/>
+<feature id="org.eclipse.birt.integration.wtp"/>
+<feature id="org.eclipse.tptp.platform.samples"/>
+<feature id="org.eclipse.swtbot.eclipse.test.junit4"/>
<feature id="org.eclipse.jsf.feature"/>
-<plugin id="org.eclipse.jst.common.project.facet.core"/>
-<feature id="org.eclipse.swtbot.eclipse.test.junit4"/>
-<feature id="org.eclipse.emf.mapping"/>
-<feature id="org.eclipse.jst.server_ui.feature"/>
+<feature id="org.eclipse.jst.web_core.feature"/>
+<feature id="org.eclipse.jst.enterprise_core.feature"/>
+<feature id="org.eclipse.wst.server_ui.feature"/>
+<feature id="org.eclipse.tptp.trace"/>
+<feature id="org.eclipse.wst.server_userdoc.feature"/>
+<feature id="org.eclipse.emf.ecore"/>
<feature id="org.eclipse.tptp.platform.batik.pdf"/>
-<feature id="org.eclipse.datatools.enablement.sap.feature"/>
-<feature id="org.eclipse.tptp.platform.core.doc.user"/>
+<feature id="org.eclipse.datatools.enablement.postgresql.feature"/>
+<feature id="org.eclipse.tptp.platform.integration.pde"/>
+<feature id="org.eclipse.birt.chart.integration.wtp"/>
+<feature id="org.eclipse.emf.edit.ui"/>
+<feature id="org.eclipse.tptp.platform.profile.server"/>
<feature id="org.eclipse.tptp.trace.jvmti"/>
-<feature id="org.eclipse.emf.databinding.edit"/>
-<feature id="org.eclipse.rcp"/>
-<feature id="org.eclipse.wst.server_userdoc.feature"/>
-<feature id="org.eclipse.datatools.enablement.postgresql.feature"/>
-<plugin id="org.eclipse.xsd.edit"/>
-<feature id="org.eclipse.datatools.sqldevtools.sqlbuilder.feature"/>
-<feature id="org.eclipse.datatools.connectivity.feature"/>
-<feature id="org.eclipse.datatools.modelbase.feature"/>
-<feature id="org.eclipse.wst.web_userdoc.feature"/>
-<feature id="org.eclipse.wst.server_adapters.feature"/>
-<feature id="org.eclipse.datatools.enablement.sybase.feature"/>
-<feature id="org.eclipse.datatools.enablement.apache.derby.feature"/>
-<feature id="org.eclipse.swtbot"/>
-<feature id="org.eclipse.platform"/>
-<feature id="org.eclipse.emf.ecore"/>
-<feature id="org.eclipse.wst.ws_wsdl15.feature"/>
-<feature id="org.eclipse.tptp.platform.core"/>
-<plugin id="org.eclipse.equinox.concurrent"/>
-<feature id="org.eclipse.datatools.doc.user"/>
-<feature id="org.eclipse.wst.xml_userdoc.feature"/>
-<feature id="org.eclipse.jst.enterprise_core.feature"/>
+<feature id="org.eclipse.emf.mapping.ecore.editor"/>
+<feature id="org.eclipse.jdt"/>
+<feature id="org.eclipse.datatools.enablement.ibm.feature"/>
<feature id="org.eclipse.datatools.sqldevtools.ddl.feature"/>
+<feature id="org.eclipse.wst.server_core.feature"/>
<feature id="org.eclipse.datatools.sqldevtools.results.feature"/>
-<plugin id="org.eclipse.jst.common.project.facet.ui"/>
+<feature id="org.eclipse.emf.mapping.ecore"/>
+<feature id="org.eclipse.swtbot.ide"/>
+<feature id="org.eclipse.datatools.enablement.sap.feature"/>
+<feature id="org.eclipse.rcp"/>
+<feature id="org.eclipse.jst.server_adapters.feature"/>
+<feature id="org.eclipse.jst.ws.jaxws.feature"/>
+<feature id="org.eclipse.tptp.platform.jvmti"/>
+<feature id="org.eclipse.emf"/>
+<feature id="org.eclipse.datatools.enablement.feature"/>
+<feature id="org.eclipse.emf.codegen"/>
+<plugin id="org.easymock"/>
+<plugin id="org.junit"/>
+<feature id="org.eclipse.wst.common_core.feature"/>
+<feature id="org.eclipse.datatools.connectivity.oda.designer.core.feature"/>
+<feature id="org.eclipse.tptp.monitoring.managedagent.agents"/>
+<feature id="org.eclipse.tptp.monitoring.mx4j.jmx"/>
+<feature id="org.maven.ide.eclipse.feature"/>
+<feature id="org.eclipse.datatools.enablement.jdt.feature"/>
<feature id="org.eclipse.datatools.connectivity.oda.feature"/>
-<feature id="org.eclipse.tptp.platform.doc.user"/>
-<feature id="org.eclipse.wst.server_ui.feature"/>
-<feature id="org.eclipse.jst.ws.jaxws.feature"/>
-<feature id="org.eclipse.birt.report.designer.editor.xml.wtp"/>
-<feature id="org.eclipse.datatools.enablement.oda.feature"/>
-<feature id="org.eclipse.tptp.platform.samples"/>
-<feature id="org.eclipse.tptp.platform.xerces"/>
+<feature id="org.eclipse.pde"/>
<feature id="org.eclipse.datatools.sqldevtools.feature"/>
-<feature id="org.eclipse.wst.common.fproj"/>
-<feature id="org.eclipse.tptp.platform.integration.pde"/>
-<feature id="org.eclipse.jst.web_userdoc.feature"/>
-<feature id="org.eclipse.emf.codegen"/>
-<feature id="org.eclipse.datatools.enablement.jdbc.feature"/>
-<feature id="org.eclipse.tptp.trace.arm"/>
-<feature id="org.eclipse.swtbot.ide"/>
-<feature id="org.eclipse.wst.web_ui.feature"/>
-<feature id="org.eclipse.gef"/>
+<feature id="org.eclipse.datatools.enablement.mysql.feature"/>
+<feature id="org.eclipse.datatools.enablement.hsqldb.feature"/>
+<feature id="org.eclipse.wst.web_core.feature"/>
+<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.zest"/>
-<feature id="org.eclipse.datatools.enablement.ingres.feature"/>
-<feature id="org.eclipse.wst.server_core.feature"/>
-<feature id="org.eclipse.datatools.enablement.ibm.feature"/>
-<feature id="org.eclipse.tptp.platform.profile.server"/>
-<feature id="org.eclipse.emf.codegen.ui"/>
-<feature id="org.eclipse.wst.xml.xpath2.processor.feature"/>
-<feature id="org.eclipse.wst.xml_core.feature"/>
-<feature id="org.eclipse.datatools.enablement.sqlite.feature"/>
+<feature id="org.eclipse.wst.ws_wsdl15.feature"/>
+<feature id="org.eclipse.emf.converter"/>
<feature id="org.eclipse.swtbot.eclipse.gef"/>
-<feature id="org.eclipse.tptp.platform.jakarta.log4j"/>
-<feature id="org.eclipse.emf.edit.ui"/>
-<plugin id="org.eclipse.xsd"/>
-<feature id="org.eclipse.jst.server_core.feature"/>
-<feature id="org.eclipse.emf.edit"/>
-<feature id="org.eclipse.jst.enterprise_userdoc.feature"/>
-<feature id="org.eclipse.emf.common.ui"/>
-<feature id="org.eclipse.tptp.platform.jvmti"/>
-<feature id="org.eclipse.draw2d"/>
-<feature id="org.eclipse.tptp.trace"/>
-<feature id="org.eclipse.tptp.platform.batik"/>
-<feature id="org.eclipse.tptp.platform.trace"/>
-<feature id="org.eclipse.datatools.connectivity.oda.designer.feature"/>
+<feature id="org.eclipse.datatools.enablement.apache.derby.feature"/>
+<feature id="org.eclipse.tptp.platform.probekit"/>
+<feature id="org.eclipse.tptp.test"/>
+<feature id="org.eclipse.jst.server_ui.feature"/>
+<feature id="org.eclipse.tptp.test.samples"/>
+<feature id="org.eclipse.tptp.test.recorders.url"/>
+<feature id="org.eclipse.tptp.trace.runtime"/>
<feature id="org.eclipse.jst.enterprise_ui.feature"/>
-<feature id="org.eclipse.jdt"/>
-<feature id="org.eclipse.jst.server_adapters.feature"/>
+<feature id="org.eclipse.wst.web_ui.feature"/>
+<feature id="org.eclipse.tptp.platform.instrumentation.ui"/>
+<feature id="org.eclipse.birt.report.designer.editor.xml.wtp"/>
<feature id="org.eclipse.emf.common"/>
-<feature id="org.eclipse.datatools.enablement.jdt.feature"/>
-<feature id="org.eclipse.datatools.enablement.msft.feature"/>
-<feature id="org.maven.ide.eclipse.wtp.feature"/>
-<feature id="org.eclipse.datatools.enablement.oda.designer.feature"/>
-<feature id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature"/>
-<feature id="org.eclipse.datatools.sqldevtools.ddlgen.feature"/>
<feature id="org.eclipse.wst.jsdt.feature"/>
-<feature id="org.eclipse.emf.codegen.ecore.ui"/>
-<feature id="org.eclipse.pde"/>
-<feature id="org.eclipse.jst.web_core.feature"/>
-<feature id="org.eclipse.birt"/>
-<feature id="org.eclipse.wst.xml_ui.feature"/>
+<feature id="org.eclipse.tptp.platform.jakarta.log4j"/>
+<feature id="org.eclipse.wst.server_adapters.feature"/>
+<feature id="org.eclipse.swtbot.eclipse"/>
+<feature id="org.eclipse.tptp.monitoring"/>
+<feature id="org.eclipse.tptp.test.runtime"/>
+<feature id="org.eclipse.emf.mapping"/>
+<feature id="org.eclipse.tptp.wtp"/>
+<feature id="org.eclipse.tptp.platform.core"/>
+<feature id="org.eclipse.jst.server_userdoc.feature"/>
+<feature id="org.eclipse.datatools.enablement.sybase.feature"/>
<feature id="org.eclipse.emf.ecore.edit"/>
-<feature id="org.maven.ide.eclipse.feature"/>
+<feature id="org.eclipse.wst.common.fproj"/>
+<feature id="org.eclipse.datatools.modelbase.feature"/>
+<feature id="org.eclipse.datatools.sqldevtools.schemaobjecteditor.feature"/>
<feature id="org.eclipse.emf.ecore.editor"/>
-<feature id="org.eclipse.tptp.trace.runtime"/>
+<feature id="org.eclipse.emf.codegen.ui"/>
+<feature id="org.eclipse.wst.xml_core.feature"/>
+<feature id="org.eclipse.jst.web_ui.feature"/>
+<feature id="org.eclipse.tptp.trace.arm"/>
+<feature id="org.eclipse.emf.edit"/>
+<feature id="org.eclipse.swtbot"/>
<feature id="org.eclipse.wst.ws_core.feature"/>
-<feature id="org.eclipse.datatools.connectivity.oda.designer.core.feature"/>
-<feature id="org.eclipse.wst.web_core.feature"/>
-<feature id="org.eclipse.wst.common_ui.feature"/>
-<feature id="org.eclipse.help"/>
-<feature id="org.eclipse.emf.converter"/>
-<feature id="org.eclipse.emf"/>
-<feature id="org.eclipse.datatools.sqldevtools.data.feature"/>
-<feature id="org.eclipse.datatools.sqldevtools.parsers.feature"/>
-<feature id="org.eclipse.tptp.platform.commons.logging"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
-<feature id="org.eclipse.emf.mapping.ui"/>
-<feature id="org.eclipse.tptp.platform.runtime"/>
-<feature id="org.eclipse.tptp.platform.report"/>
-<feature id="org.eclipse.tptp.trace.arm.ui"/>
-<feature id="org.eclipse.emf.mapping.ecore.editor"/>
-<feature id="org.eclipse.tptp.platform.instrumentation.ui"/>
-<feature id="org.eclipse.jst.server_userdoc.feature"/>
-<feature id="org.eclipse.wst.xsl.feature"/>
-<feature id="org.eclipse.datatools.enablement.mysql.feature"/>
+<feature id="org.eclipse.tptp.platform.batik"/>
+<feature id="org.eclipse.datatools.enablement.oda.feature"/>
+<feature id="org.eclipse.wst.ws_ui.feature"/>
<feature id="org.eclipse.datatools.enablement.oracle.feature"/>
+<feature id="org.eclipse.emf.codegen.ecore.ui"/>
+<feature id="org.eclipse.tptp.monitoring.examples"/>
+<feature id="org.eclipse.emf.databinding"/>
+<feature id="org.eclipse.tptp.platform.commons.logging"/>
</includeBundles>
</target>
15 years, 9 months
JBoss Tools SVN: r23410 - in trunk/jmx: tests/org.jboss.tools.jmx.ui.test/META-INF and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2010-07-14 19:02:31 -0400 (Wed, 14 Jul 2010)
New Revision: 23410
Modified:
trunk/jmx/plugins/org.jboss.tools.jmx.ui/META-INF/MANIFEST.MF
trunk/jmx/tests/org.jboss.tools.jmx.ui.test/META-INF/MANIFEST.MF
Log:
fix coverage report that includes tests classes for jmx.ui.tests
Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.ui/META-INF/MANIFEST.MF 2010-07-14 22:30:14 UTC (rev 23409)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/META-INF/MANIFEST.MF 2010-07-14 23:02:31 UTC (rev 23410)
@@ -13,6 +13,16 @@
org.jboss.tools.jmx.core;bundle-version="[1.0.0,2.0.0)"
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.jboss.tools.jmx.ui.extensions,
- org.jboss.tools.jmx.ui.internal.views.navigator
+Export-Package: org.jboss.tools.jmx.ui,
+ org.jboss.tools.jmx.ui.extensions,
+ org.jboss.tools.jmx.ui.internal;x-internal:=true,
+ org.jboss.tools.jmx.ui.internal.actions;x-internal:=true,
+ org.jboss.tools.jmx.ui.internal.adapters;x-internal:=true,
+ org.jboss.tools.jmx.ui.internal.controls;x-internal:=true,
+ org.jboss.tools.jmx.ui.internal.dialogs;x-internal:=true,
+ org.jboss.tools.jmx.ui.internal.editors;x-internal:=true,
+ org.jboss.tools.jmx.ui.internal.perspectives;x-internal:=true,
+ org.jboss.tools.jmx.ui.internal.tables;x-internal:=true,
+ org.jboss.tools.jmx.ui.internal.views.navigator,
+ org.jboss.tools.jmx.ui.internal.wizards;x-internal:=true
Bundle-ActivationPolicy: lazy
Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/META-INF/MANIFEST.MF 2010-07-14 22:30:14 UTC (rev 23409)
+++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/META-INF/MANIFEST.MF 2010-07-14 23:02:31 UTC (rev 23410)
@@ -3,8 +3,9 @@
Bundle-Name: %Bundle-Name.f0
Bundle-SymbolicName: org.jboss.tools.jmx.ui.test
Bundle-Version: 1.1.0.qualifier
-Fragment-Host: org.jboss.tools.jmx.ui
-Require-Bundle: org.junit
+Require-Bundle: org.junit,
+ org.jboss.tools.jmx.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %Bundle-Vendor.f0
Bundle-Localization: plugin
+Bundle-ActivationPolicy: lazy
15 years, 9 months
JBoss Tools SVN: r23409 - in trunk/build: results and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-14 18:30:14 -0400 (Wed, 14 Jul 2010)
New Revision: 23409
Modified:
trunk/build/publish.sh
trunk/build/results/build.xml
Log:
reorg the results so that update site is in repo/ dir
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-14 20:43:38 UTC (rev 23408)
+++ trunk/build/publish.sh 2010-07-14 22:30:14 UTC (rev 23409)
@@ -18,8 +18,11 @@
if [[ $DESTINATION == "" ]]; then DESTINATION="tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/nightly/3.2.helios"; fi
+# where to create the stuff to publish
+STAGINGDIR=${WORKSPACE}/results/${JOB_NAME}
+
# cleanup from last time
-rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME}
+rm -fr ${WORKSPACE}/results; mkdir -p ${STAGINGDIR}
# check for aggregate zip or overall zip
z=""
@@ -40,15 +43,16 @@
if [[ $z != "" ]] && [[ -f $z ]] ; then
#echo "$z ..."
# note the job name, build number, and build ID of the latest snapshot zip
- echo "JOB_NAME = ${JOB_NAME}" > ${WORKSPACE}/site/${JOB_NAME}/JOB_NAME.txt
- echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_NUMBER.txt
- echo "BUILD_ID = ${BUILD_ID}" > ${WORKSPACE}/site/${JOB_NAME}/BUILD_ID.txt
+ echo "JOB_NAME = ${JOB_NAME}" > ${STAGINGDIR}/JOB_NAME.txt
+ echo "BUILD_NUMBER = ${BUILD_NUMBER}" > ${STAGINGDIR}/BUILD_NUMBER.txt
+ echo "BUILD_ID = ${BUILD_ID}" > ${STAGINGDIR}/BUILD_ID.txt
# unzip into workspace for publishing as unpacked site
- unzip -u -o -q -d ${WORKSPACE}/site/${JOB_NAME}/ $z
+ mkdir -p ${STAGINGDIR}/all/repo
+ unzip -u -o -q -d ${STAGINGDIR}/all/repo $z
# copy into workspace for access by bucky aggregator (same name every time)
- rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
+ rsync -aq $z ${STAGINGDIR}/${SNAPNAME}
fi
z=""
@@ -58,29 +62,29 @@
if [[ $y != "aggregate" ]]; then # prevent duplicate nested sites
#echo "[$y] $z ..."
# unzip into workspace for publishing as unpacked site
- mkdir -p ${WORKSPACE}/site/${JOB_NAME}/$y
- unzip -u -o -q -d ${WORKSPACE}/site/${JOB_NAME}/$y $z
+ mkdir -p ${STAGINGDIR}/$y
+ unzip -u -o -q -d ${STAGINGDIR}/$y $z
# copy into workspace for access by bucky aggregator (same name every time)
- rsync -aq $z ${WORKSPACE}/site/${JOB_NAME}/${y}${SUFFNAME}
+ rsync -aq $z ${STAGINGDIR}/${y}${SUFFNAME}
fi
done
# if zips exist produced & renamed by ant script, copy them too
-if [[ ! -f ${WORKSPACE}/site/${SNAPNAME} ]]; then
+if [[ ! -f ${WORKSPACE}/results/${SNAPNAME} ]]; then
for z in $(find ${WORKSPACE} -maxdepth 5 -mindepth 3 -name "*Update*.zip"); do
#echo "$z ..."
- unzip -u -o -q -d ${WORKSPACE}/site/${JOB_NAME}/ $z
- rsync -aq $z ${WORKSPACE}/site/${SNAPNAME}
+ unzip -u -o -q -d ${STAGINGDIR}/ $z
+ rsync -aq $z ${WORKSPACE}/results/${SNAPNAME}
done
fi
# get sources zip
if [[ -f ${WORKSPACE}/sources/build/sources/target/sources.zip ]]; then
- rsync -aq ${WORKSPACE}/sources/build/sources/target/sources.zip ${WORKSPACE}/site/${JOB_NAME}/${SRCSNAME}
+ rsync -aq ${WORKSPACE}/sources/build/sources/target/sources.zip ${STAGINGDIR}/all/${SRCSNAME}
else
# create sources zip
pushd ${WORKSPACE}/sources
- zip ${WORKSPACE}/site/${JOB_NAME}/${SRCSNAME} -q -r * -x documentation\* -x download.jboss.org\* -x requirements\* \
+ zip ${STAGINGDIR}/all/${SRCSNAME} -q -r * -x documentation\* -x download.jboss.org\* -x requirements\* \
-x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\* -x \*classes\* -x \*bin\* -x \*.zip \
-x \*docs\* -x \*reference\* -x \*releng\*
popd
@@ -88,17 +92,18 @@
# generate HTML snippet for inclusion on jboss.org
if [[ ${RELEASE} == "Yes" ]]; then
+ ANT_PARAMS="-DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Doutput.dir=${WORKSPACE}/results"
if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then
- ant -f ${WORKSPACE}/build/results/build.xml "-DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME}"
+ ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS}
elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then
- ant -f ${WORKSPACE}/sources/build/results/build.xml "-DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME}"
+ ant -f ${WORKSPACE}/sources/build/results/build.xml ${ANT_PARAMS}
fi
fi
# get full build log and filter out Maven test failures
-bl=${WORKSPACE}/site/${JOB_NAME}/BUILDLOG.txt
+bl=${STAGINGDIR}/BUILDLOG.txt
wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl}
-fl=${WORKSPACE}/site/${JOB_NAME}/FAIL_LOG.txt
+fl=${STAGINGDIR}/FAIL_LOG.txt
sed -ne "/<<< FAI/,+9 p" ${bl} | sed -e "/AILURE/,+9 s/\(.\+AILURE.\+\)/\n----------\n\n\1/g" > ${fl}
sed -ne "/ FAI/ p" ${bl} | sed -e "/AILURE \[/ s/\(.\+AILURE \[.\+\)/\n----------\n\n\1/g" >> ${fl}
sed -ne "/ SKI/ p" ${bl} | sed -e "/KIPPED \[/ s/\(.\+KIPPED \[.\+\)/\n----------\n\n\1/g" >> ${fl}
@@ -110,7 +115,7 @@
if [[ $fc != "0" ]]; then
echo "" >> ${fl}; echo -n "SKI" >> ${fl}; echo -n "PS FOUND: "$fc >> ${fl};
fi
-el=${WORKSPACE}/site/${JOB_NAME}/ERRORLOG.txt
+el=${STAGINGDIR}/ERRORLOG.txt
sed -ne "/<<< ERR/,+9 p" ${bl} | sed -e "/RROR/,+9 s/\(.\+RROR.\+\)/\n----------\n\n\1/g" > ${el}
sed -ne "/\[ERR/,+2 p" ${bl} | sed -e "/ROR\] Fai/,+2 s/\(.\+ROR\] Fai.\+\)/\n----------\n\n\1/g" >> ${el}
ec=$(sed -ne "/ERR\|RROR/ p" ${el} | wc -l)
@@ -118,20 +123,20 @@
echo "" >> ${el}; echo -n "ERR" >> ${el}; echo "ORS FOUND: "$ec >> ${el};
fi
-date
-rsync -arzq ${WORKSPACE}/site/${JOB_NAME}/*LOG.txt $DESTINATION/${JOB_NAME}/
-date
-
# publish to download.jboss.org, unless errors found - avoid destroying last-good update site
if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then
date
# publish update site dir
- if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then
- rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/
+ if [[ -d ${STAGINGDIR} ]]; then
+ rsync -arzq --delete ${STAGINGDIR} $DESTINATION/
fi
# publish update site zip
- if [[ -f ${WORKSPACE}/site/${SNAPNAME} ]]; then
- rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/
+ if [[ -f ${WORKSPACE}/results/${SNAPNAME} ]]; then
+ rsync -arzq --delete ${WORKSPACE}/results/${SNAPNAME} $DESTINATION/
fi
fi
+
date
+rsync -arzq ${STAGINGDIR}/*LOG.txt $DESTINATION/${JOB_NAME}/
+date
+
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2010-07-14 20:43:38 UTC (rev 23408)
+++ trunk/build/results/build.xml 2010-07-14 22:30:14 UTC (rev 23409)
@@ -1,168 +1,168 @@
-<project default="build.results">
-
- <!-- should be set by script or in Hudson -->
- <property name="ZIPSUFFIX" value="SNAPSHOT" />
-
- <!-- should be set by Hudson -->
- <!-- <property name="JOB_NAME" value="jbosstools-3.2.0.M2.continuous" /> -->
-
- <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. -->
- <condition property="output.dir" value="${WORKSPACE}/site" else="${basedir}">
- <available file="${WORKSPACE}/site" />
- </condition>
-
- <condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}/../..">
- <available file="/home/hudson/static_build_env/jbds" type="dir" />
- </condition>
-
- <mkdir dir="${WORKINGDIR}" />
- <echo level="info">WORKINGDIR = ${WORKINGDIR}</echo>
-
- <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools">
- <available file="/home/hudson/static_build_env/jbds" type="dir" />
- </condition>
- <condition property="COMMON_TOOLS" value="${WORKINGDIR}/../tools" else="${java.io.tmpdir}">
- <available file="${WORKINGDIR}/../tools" type="dir" />
- </condition>
- <mkdir dir="${COMMON_TOOLS}" />
- <echo level="info">COMMON_TOOLS = ${COMMON_TOOLS}</echo>
-
- <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
- <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
- </condition>
- <condition property="build.xml" value="${basedir}/../../build/build.xml">
- <available file="${basedir}/../../build/build.xml" type="file" />
- </condition>
- <condition property="build.xml" value="${basedir}/../../build.xml">
- <available file="${basedir}/../../build.xml" type="file" />
- </condition>
- <!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
-
- <target name="init">
- <ant antfile="${build.xml}" target="init" />
-
- <macrodef name="get.size">
- <attribute name="file" />
- <attribute name="property" />
- <sequential>
- <var name="size" unset="true" />
- <var name="size-in-mb" unset="true" />
- <if>
- <available file="@{file}" />
- <then>
- <length file="@{file}" property="size" />
- <math result="size-in-mb">
- <op op="/">
- <op op="floor">
- <op op="*">
- <op op="/">
- <num value="${size}" />
- <num value="1048576" />
- </op>
- <num value="100" />
- </op>
- </op>
- <num value="100" />
- </op>
- </math>
-
- <property name="@{property}" value="${size-in-mb}" />
- </then>
- <else>
- <property name="@{property}" value="-1" />
- </else>
- </if>
- </sequential>
- </macrodef>
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
- </classpath>
- </taskdef>
- </target>
-
- <target name="build.results" depends="init">
- <!--
- 1. resolve variables in download-template.xml to produce download.xml
- 2. XSL transform download.xml to produce download.snippet.txt
- 3. manually copy the contents of this file into a page under
- http://www.jboss.org/tools/downloads/
- -->
- <for param="UPDATEZIP">
- <path>
- <fileset dir="${WORKINGDIR}/site">
- <include name="*-Update-${ZIPSUFFIX}.zip" />
- <include name="*-Sources-${ZIPSUFFIX}.zip" />
- </fileset>
- </path>
- <sequential>
- <var name="filename" unset="true" />
- <propertyregex property="filename"
- input="@{UPDATEZIP}"
- defaultvalue="@{UPDATEZIP}"
- regexp=".+/([^/]+\.zip)"
- replace="\1"
- casesensitive="false"
- override="true"
- />
- <propertyregex property="COMPONENT"
- input="${filename}"
- defaultvalue="${filename}"
- regexp="(.+)-(Update|Sources)-${ZIPSUFFIX}\.zip"
- replace="\1"
- casesensitive="false"
- override="true"
- />
-
- <if>
- <and>
- <isset property="JOB_NAME" />
- <equals arg1="${COMPONENT}" arg2="${JOB_NAME}" />
- </and>
- <then>
- <if>
- <equals arg1="${filename}" arg2="${JOB_NAME}-Sources-${ZIPSUFFIX}.zip" />
- <then>
- <var name="COMPONENT" unset="true" />
- <var name="COMPONENT" value="sources" />
- </then>
- <elseif>
- <equals arg1="${filename}" arg2="${JOB_NAME}-Update-${ZIPSUFFIX}.zip" />
- <then>
- <var name="COMPONENT" unset="true" />
- <var name="COMPONENT" value="update" />
- </then>
- </elseif>
- </if>
- </then>
- </if>
-
- <echo level="verbose">UPDATEZIP = @{UPDATEZIP}
-COMPONENT = ${COMPONENT}</echo>
- <property name="${COMPONENT}-filename" value="${filename}" />
-
- <get.size file="@{UPDATEZIP}" property="${COMPONENT}-filesize" />
-
- <!--
- <var name="filesize" unset="true" />
- <propertycopy from="${COMPONENT}-filesize" property="filesize" override="true" silent="true" />
- <echo level="info">filesize = ${filesize}</echo>
- <echo level="info">filename = ${filename}</echo>
- <var name="filesize" unset="true" />
- -->
- <var name="filename" unset="true" />
- </sequential>
- </for>
-
- <copy todir="${output.dir}" overwrite="true">
- <fileset file="download-template.xml" />
- <mapper type="merge" to="download.xml" />
- <filterchain>
- <expandproperties />
- </filterchain>
- </copy>
- <xslt in="${output.dir}/download.xml" out="${output.dir}/download-snippet.txt" style="download.xsl" />
- <delete file="${output.dir}/download.xml" />
- </target>
-
+<project default="build.results">
+
+ <!-- should be set by script or in Hudson -->
+ <property name="ZIPSUFFIX" value="SNAPSHOT" />
+
+ <!-- should be set by Hudson -->
+ <!-- <property name="JOB_NAME" value="jbosstools-3.2.0.M2.continuous" /> -->
+
+ <!-- if ${WORKSPACE}/site folder exists, target that folder; else generate here. -->
+ <condition property="output.dir" value="${WORKSPACE}/results" else="${basedir}">
+ <available file="${WORKSPACE}/results" />
+ </condition>
+
+ <condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}/../..">
+ <available file="/home/hudson/static_build_env/jbds" type="dir" />
+ </condition>
+
+ <mkdir dir="${WORKINGDIR}" />
+ <echo level="info">WORKINGDIR = ${WORKINGDIR}</echo>
+
+ <condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools">
+ <available file="/home/hudson/static_build_env/jbds" type="dir" />
+ </condition>
+ <condition property="COMMON_TOOLS" value="${WORKINGDIR}/../tools" else="${java.io.tmpdir}">
+ <available file="${WORKINGDIR}/../tools" type="dir" />
+ </condition>
+ <mkdir dir="${COMMON_TOOLS}" />
+ <echo level="info">COMMON_TOOLS = ${COMMON_TOOLS}</echo>
+
+ <condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
+ <available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
+ </condition>
+ <condition property="build.xml" value="${basedir}/../../build/build.xml">
+ <available file="${basedir}/../../build/build.xml" type="file" />
+ </condition>
+ <condition property="build.xml" value="${basedir}/../../build.xml">
+ <available file="${basedir}/../../build.xml" type="file" />
+ </condition>
+ <!-- if can't calculate where build/build.xml is located, must pass in path from parent when calling this script -->
+
+ <target name="init">
+ <ant antfile="${build.xml}" target="init" />
+
+ <macrodef name="get.size">
+ <attribute name="file" />
+ <attribute name="property" />
+ <sequential>
+ <var name="size" unset="true" />
+ <var name="size-in-mb" unset="true" />
+ <if>
+ <available file="@{file}" />
+ <then>
+ <length file="@{file}" property="size" />
+ <math result="size-in-mb">
+ <op op="/">
+ <op op="floor">
+ <op op="*">
+ <op op="/">
+ <num value="${size}" />
+ <num value="1048576" />
+ </op>
+ <num value="100" />
+ </op>
+ </op>
+ <num value="100" />
+ </op>
+ </math>
+
+ <property name="@{property}" value="${size-in-mb}" />
+ </then>
+ <else>
+ <property name="@{property}" value="-1" />
+ </else>
+ </if>
+ </sequential>
+ </macrodef>
+ <taskdef resource="net/sf/antcontrib/antlib.xml">
+ <classpath>
+ <pathelement location="${COMMON_TOOLS}/ant-contrib.jar" />
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="build.results" depends="init">
+ <!--
+ 1. resolve variables in download-template.xml to produce download.xml
+ 2. XSL transform download.xml to produce download.snippet.txt
+ 3. manually copy the contents of this file into a page under
+ http://www.jboss.org/tools/downloads/
+ -->
+ <for param="UPDATEZIP">
+ <path>
+ <fileset dir="${WORKINGDIR}/site">
+ <include name="*-Update-${ZIPSUFFIX}.zip" />
+ <include name="*-Sources-${ZIPSUFFIX}.zip" />
+ </fileset>
+ </path>
+ <sequential>
+ <var name="filename" unset="true" />
+ <propertyregex property="filename"
+ input="@{UPDATEZIP}"
+ defaultvalue="@{UPDATEZIP}"
+ regexp=".+/([^/]+\.zip)"
+ replace="\1"
+ casesensitive="false"
+ override="true"
+ />
+ <propertyregex property="COMPONENT"
+ input="${filename}"
+ defaultvalue="${filename}"
+ regexp="(.+)-(Update|Sources)-${ZIPSUFFIX}\.zip"
+ replace="\1"
+ casesensitive="false"
+ override="true"
+ />
+
+ <if>
+ <and>
+ <isset property="JOB_NAME" />
+ <equals arg1="${COMPONENT}" arg2="${JOB_NAME}" />
+ </and>
+ <then>
+ <if>
+ <equals arg1="${filename}" arg2="${JOB_NAME}-Sources-${ZIPSUFFIX}.zip" />
+ <then>
+ <var name="COMPONENT" unset="true" />
+ <var name="COMPONENT" value="sources" />
+ </then>
+ <elseif>
+ <equals arg1="${filename}" arg2="${JOB_NAME}-Update-${ZIPSUFFIX}.zip" />
+ <then>
+ <var name="COMPONENT" unset="true" />
+ <var name="COMPONENT" value="update" />
+ </then>
+ </elseif>
+ </if>
+ </then>
+ </if>
+
+ <echo level="verbose">UPDATEZIP = @{UPDATEZIP}
+COMPONENT = ${COMPONENT}</echo>
+ <property name="${COMPONENT}-filename" value="${filename}" />
+
+ <get.size file="@{UPDATEZIP}" property="${COMPONENT}-filesize" />
+
+ <!--
+ <var name="filesize" unset="true" />
+ <propertycopy from="${COMPONENT}-filesize" property="filesize" override="true" silent="true" />
+ <echo level="info">filesize = ${filesize}</echo>
+ <echo level="info">filename = ${filename}</echo>
+ <var name="filesize" unset="true" />
+ -->
+ <var name="filename" unset="true" />
+ </sequential>
+ </for>
+
+ <copy todir="${output.dir}" overwrite="true">
+ <fileset file="download-template.xml" />
+ <mapper type="merge" to="download.xml" />
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <xslt in="${output.dir}/download.xml" out="${output.dir}/download-snippet.txt" style="download.xsl" />
+ <delete file="${output.dir}/download.xml" />
+ </target>
+
</project>
15 years, 9 months
JBoss Tools SVN: r23408 - trunk.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-14 16:43:38 -0400 (Wed, 14 Jul 2010)
New Revision: 23408
Modified:
trunk/parent-pom.xml
Log:
move from M1 to M2 as the artifact suffix in trunk
Modified: trunk/parent-pom.xml
===================================================================
--- trunk/parent-pom.xml 2010-07-14 18:07:55 UTC (rev 23407)
+++ trunk/parent-pom.xml 2010-07-14 20:43:38 UTC (rev 23408)
@@ -11,7 +11,7 @@
<!-- <tychoVersion>0.10.0-SNAPSHOT</tychoVersion> -->
<tychoVersion>0.9.0</tychoVersion>
<scmBranch>trunk</scmBranch>
- <BUILD_ALIAS>M1</BUILD_ALIAS>
+ <BUILD_ALIAS>M2</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
15 years, 9 months
JBoss Tools SVN: r23407 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-14 14:07:55 -0400 (Wed, 14 Jul 2010)
New Revision: 23407
Modified:
trunk/build/publish.sh
Log:
check for results build.xml in two locations
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-14 16:49:52 UTC (rev 23406)
+++ trunk/build/publish.sh 2010-07-14 18:07:55 UTC (rev 23407)
@@ -88,7 +88,11 @@
# generate HTML snippet for inclusion on jboss.org
if [[ ${RELEASE} == "Yes" ]]; then
- ant -f ${WORKSPACE}/build/results/build.xml "-DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME}"
+ if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then
+ ant -f ${WORKSPACE}/build/results/build.xml "-DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME}"
+ elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then
+ ant -f ${WORKSPACE}/sources/build/results/build.xml "-DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME}"
+ fi
fi
# get full build log and filter out Maven test failures
15 years, 9 months
JBoss Tools SVN: r23406 - trunk/build.
by jbosstools-commits@lists.jboss.org
Author: nickboldt
Date: 2010-07-14 12:49:52 -0400 (Wed, 14 Jul 2010)
New Revision: 23406
Modified:
trunk/build/publish.sh
Log:
typo
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-14 13:31:28 UTC (rev 23405)
+++ trunk/build/publish.sh 2010-07-14 16:49:52 UTC (rev 23406)
@@ -80,7 +80,7 @@
else
# create sources zip
pushd ${WORKSPACE}/sources
- zip ${WORKSPACE}/site/{JOB_NAME}/${SRCSNAME} -q -r * -x documentation\* -x download.jboss.org\* -x requirements\* \
+ zip ${WORKSPACE}/site/${JOB_NAME}/${SRCSNAME} -q -r * -x documentation\* -x download.jboss.org\* -x requirements\* \
-x workingset\* -x labs\* -x build\* -x \*test\* -x \*target\* -x \*.class -x \*.svn\* -x \*classes\* -x \*bin\* -x \*.zip \
-x \*docs\* -x \*reference\* -x \*releng\*
popd
15 years, 9 months