JBoss Tools SVN: r42385 - trunk/central/tests/org.jboss.tools.central.test.ui.bot/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-07-04 05:19:35 -0400 (Wed, 04 Jul 2012)
New Revision: 42385
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/META-INF/MANIFEST.MF
Log:
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/META-INF/MANIFEST.MF
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/META-INF/MANIFEST.MF 2012-07-04 09:01:18 UTC (rev 42384)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/META-INF/MANIFEST.MF 2012-07-04 09:19:35 UTC (rev 42385)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: org.jboss.tools.central.test.ui.bot
Bundle-SymbolicName: org.jboss.tools.central.test.ui.bot;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 9 months
JBoss Tools SVN: r42384 - trunk/central/tests/org.jboss.tools.central.test.ui.bot.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-07-04 05:01:18 -0400 (Wed, 04 Jul 2012)
New Revision: 42384
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
Log:
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-07-04 08:59:52 UTC (rev 42383)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-07-04 09:01:18 UTC (rev 42384)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.central</groupId>
<artifactId>tests</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.central.tests</groupId>
<artifactId>org.jboss.tools.central.test.ui.bot</artifactId>
13 years, 9 months
JBoss Tools SVN: r42383 - in trunk/tests/plugins: org.jboss.tools.tests.installation/META-INF and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mickael_istria
Date: 2012-07-04 04:59:52 -0400 (Wed, 04 Jul 2012)
New Revision: 42383
Modified:
trunk/tests/plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.tests.installation/pom.xml
trunk/tests/plugins/org.jboss.tools.tests.performance/META-INF/MANIFEST.MF
trunk/tests/plugins/org.jboss.tools.tests.performance/pom.xml
Log:
JBIDE-11713: Fix a relative path
Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF 2012-07-04 08:48:22 UTC (rev 42382)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/META-INF/MANIFEST.MF 2012-07-04 08:59:52 UTC (rev 42383)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests for Installation and Updates
Bundle-SymbolicName: org.jboss.tools.tests.installation
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-Vendor: JBoss, by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit;bundle-version="4.0.0",
Modified: trunk/tests/plugins/org.jboss.tools.tests.installation/pom.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.installation/pom.xml 2012-07-04 08:48:22 UTC (rev 42382)
+++ trunk/tests/plugins/org.jboss.tools.tests.installation/pom.xml 2012-07-04 08:59:52 UTC (rev 42383)
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.tools.tests</groupId>
- <artifactId>org.jboss.tools.tests.installation</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>plugins</artifactId>
<version>3.3.0-SNAPSHOT</version>
- <relativePath>../..</relativePath>
</parent>
+
+ <groupId>org.jboss.tools.tests</groupId>
+ <artifactId>org.jboss.tools.tests.installation</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+
</project>
Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/META-INF/MANIFEST.MF
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.performance/META-INF/MANIFEST.MF 2012-07-04 08:48:22 UTC (rev 42382)
+++ trunk/tests/plugins/org.jboss.tools.tests.performance/META-INF/MANIFEST.MF 2012-07-04 08:59:52 UTC (rev 42383)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Performance tests
Bundle-SymbolicName: org.jboss.tools.tests.performance
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-Activator: org.jboss.tools.tests.performance.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Modified: trunk/tests/plugins/org.jboss.tools.tests.performance/pom.xml
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests.performance/pom.xml 2012-07-04 08:48:22 UTC (rev 42382)
+++ trunk/tests/plugins/org.jboss.tools.tests.performance/pom.xml 2012-07-04 08:59:52 UTC (rev 42383)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools.tests</groupId>
<artifactId>plugins</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.tests.plugins</groupId>
<artifactId>org.jboss.tools.tests.performance</artifactId>
13 years, 9 months
JBoss Tools SVN: r42382 - trunk/central/tests/org.jboss.tools.central.test.ui.bot.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-07-04 04:48:22 -0400 (Wed, 04 Jul 2012)
New Revision: 42382
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
Log:
Changed parent version
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-07-03 23:03:36 UTC (rev 42381)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-07-04 08:48:22 UTC (rev 42382)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools.central</groupId>
<artifactId>tests</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.central.tests</groupId>
<artifactId>org.jboss.tools.central.test.ui.bot</artifactId>
@@ -77,14 +77,19 @@
</dependency>-->
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.jboss.tools.community.project.examples.feature.feature.group</artifactId>
+ <artifactId>org.eclipse.mylyn.commons.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.jboss.tools.maven.project.examples.feature.feature.group</artifactId>
+ <artifactId>org.jboss.tools.community.project.examples.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
+<!-- <dependency> -->
+<!-- <type>p2-installable-unit</type> -->
+<!-- <artifactId>org.jboss.tools.maven.project.examples.feature.feature.group</artifactId> -->
+<!-- <version>0.0.0</version> -->
+<!-- </dependency> -->
<dependency>
<type>p2-installable-unit</type>
<artifactId>org.jboss.tools.openshift.express.feature.feature.group</artifactId>
@@ -95,11 +100,6 @@
<artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.mylyn.commons.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
</dependencies>
</configuration>
</plugin>
13 years, 9 months
JBoss Tools SVN: r42381 - in trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb: include and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-03 19:03:36 -0400 (Tue, 03 Jul 2012)
New Revision: 42381
Added:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/PageInclude.java
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/FaceletPageContextImpl.java
Log:
JBIDE-3526
https://issues.jboss.org/browse/JBIDE-3526
Vars are loaded from ui:param.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-07-03 23:02:25 UTC (rev 42380)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-07-03 23:03:36 UTC (rev 42381)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb;
+import java.io.File;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
@@ -24,6 +25,7 @@
import org.eclipse.core.filebuffers.FileBuffers;
import org.eclipse.core.filebuffers.ITextFileBuffer;
import org.eclipse.core.internal.resources.ICoreConstants;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
@@ -74,6 +76,7 @@
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
@@ -93,7 +96,10 @@
import org.jboss.tools.common.util.EclipseUIUtil;
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.common.validation.ValidationELReference;
+import org.jboss.tools.jst.web.WebUtils;
import org.jboss.tools.jst.web.kb.include.IncludeContextBuilder;
+import org.jboss.tools.jst.web.kb.include.IncludeModel;
+import org.jboss.tools.jst.web.kb.include.PageInclude;
import org.jboss.tools.jst.web.kb.internal.FaceletPageContextImpl;
import org.jboss.tools.jst.web.kb.internal.JspContextImpl;
import org.jboss.tools.jst.web.kb.internal.ResourceBundle;
@@ -415,6 +421,10 @@
// Fill JSP namespaces defined in TLDCMDocumentManager
fillJSPNameSpaces((JspContextImpl)context, document);
}
+
+ if(file != null) {
+ IncludeModel.getInstance().clean(file.getFullPath());
+ }
// The subsequently called functions may use the file and document
// already stored in context for their needs
fillContextForChildNodes(model.getStructuredDocument(), domDocument, context, parents);
@@ -604,6 +614,9 @@
}
if (context instanceof FaceletPageContextImpl) {
+ if(node instanceof IDOMElement && context.getResource() != null && context.getResource().exists()) {
+ fillUIParamsForNode((IDOMElement)node, (ELContextImpl)context);
+ }
// Insert here the initialization code for FaceletPage context elements which may exist in Text nodes
}
@@ -633,6 +646,88 @@
}
}
+ private static void fillUIParamsForNode(IDOMElement node, ELContextImpl context) {
+ String ATTR_SRC = "src"; //$NON-NLS-1$
+ String NODE_PARAM = "param"; //$NON-NLS-1$
+ String ATTR_NAME = "name"; //$NON-NLS-1$
+ String ATTR_VALUE = "value"; //$NON-NLS-1$
+ if(IncludeContextBuilder.TAG_INCLUDE.equals(node.getLocalName()) && CustomTagLibManager.FACELETS_UI_TAG_LIB_URI.equals(node.getNamespaceURI())) {
+ String src = node.getAttribute(ATTR_SRC);
+ if(src == null || src.trim().length() == 0) {
+ return;
+ }
+ IFile includedFile = getFile(src, context.getResource());
+ if(includedFile == null) return;
+ NodeList list = node.getElementsByTagNameNS (CustomTagLibManager.FACELETS_UI_TAG_LIB_URI, NODE_PARAM);
+ List<Var> vars = null;
+ for (int i = 0; i < list.getLength(); i++) {
+ Node n = list.item(i);
+ if(n instanceof IDOMElement) {
+ IDOMElement element = (IDOMElement)n;
+ synchronized (element) {
+ if(element.hasAttribute(ATTR_NAME)) {
+ String var = element.getAttribute(ATTR_NAME);
+ int declOffset = 0;
+ int declLength = 0;
+ Node varAttr = element.getAttributeNode(ATTR_NAME);
+ if (varAttr instanceof IDOMAttr) {
+ int varNameStart = ((IDOMAttr)varAttr).getNameRegionStartOffset();
+ int varNameEnd = ((IDOMAttr)varAttr).getNameRegionEndOffset();
+ declOffset = varNameStart;
+ declLength = varNameEnd - varNameStart;
+ }
+ var = var.trim();
+ if(!"".equals(var)) { //$NON-NLS-1$
+ if(element.hasAttribute(ATTR_VALUE)) {
+ String value = element.getAttribute(ATTR_VALUE);
+ value = value.trim();
+ Var newVar = new Var(ELParserUtil.getJbossFactory(), var, value, declOffset, declLength);
+ if(newVar.getElToken()!=null) {
+ if(vars == null) {
+ vars = new ArrayList<Var>();
+ }
+ vars.add(newVar);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if(!vars.isEmpty()) {
+ PageInclude include = new PageInclude(context.getResource().getFullPath(), includedFile.getFullPath(), vars);
+ IncludeModel.getInstance().addInclude(context.getResource().getFullPath(), include);
+ }
+ }
+ }
+
+ public static IFile getFile(String fileName, IFile includeFile) {
+ IFile file = null;
+ if (fileName.startsWith("/")) { //$NON-NLS-1$
+ IContainer[] webRootFolders = WebUtils.getWebRootFolders(includeFile.getProject());
+ if (webRootFolders.length > 0) {
+ for (IContainer webRootFolder : webRootFolders) {
+ IFile handle = webRootFolder.getFile(new Path(fileName));
+ if (handle.exists()) {
+ file = handle;
+ break;
+ }
+ }
+ } else {
+ file = resolveRelatedPath(includeFile, fileName); // ?
+ }
+ } else {
+ file = resolveRelatedPath(includeFile, fileName);
+ }
+ return file;
+ }
+ private static IFile resolveRelatedPath(IFile baseFile,
+ String relatedFilePath) {
+ IPath currentFolder = baseFile.getParent().getFullPath();
+ IPath path = currentFolder.append(relatedFilePath);
+ return ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+ }
+
private static void fillElReferencesForNode(IDocument document, IDOMNode node, XmlContextImpl context) {
IStructuredDocumentRegion regionNode = node.getFirstStructuredDocumentRegion();
if (regionNode == null) return;
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java 2012-07-03 23:03:36 UTC (rev 42381)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.jst.web.kb.include;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.common.el.core.resolver.Var;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class IncludeModel {
+
+ private final static IncludeModel instance = new IncludeModel();
+
+ public static IncludeModel getInstance() {
+ return instance;
+ }
+
+ private Map<IPath, List<PageInclude>> directReferences = new HashMap<IPath, List<PageInclude>>();
+ private Map<IPath, List<PageInclude>> parentReferences = new HashMap<IPath, List<PageInclude>>();
+
+ private IncludeModel() {}
+
+ public synchronized void clean(IPath parent) {
+ List<PageInclude> old = directReferences.remove(parent);
+ if(old != null && !old.isEmpty()) {
+ for (IPath child: parentReferences.keySet()) {
+ Iterator<PageInclude> is = parentReferences.get(child).iterator();
+ while(is.hasNext()) {
+ PageInclude i = is.next();
+ if(i.getParent().equals(parent)) {
+ is.remove();
+ }
+ }
+ }
+ }
+ }
+
+ public synchronized void addInclude(IPath parent, PageInclude include) {
+ List<PageInclude> current = directReferences.get(parent);
+ if(current == null) {
+ current = new ArrayList<PageInclude>();
+ directReferences.put(parent, current);
+ }
+ current.add(include);
+ IPath child = include.getPath();
+ List<PageInclude> is = parentReferences.get(child);
+ if(is == null) {
+ is = new ArrayList<PageInclude>();
+ parentReferences.put(child, is);
+ }
+ is.add(include);
+ }
+
+ public synchronized List<Var> getVars(IPath page) {
+ List<Var> result = new ArrayList<Var>();
+ List<PageInclude> is = parentReferences.get(page);
+ if(is != null) {
+ for (PageInclude i: is) {
+ result.addAll(i.getVars());
+ }
+ }
+ return result;
+ }
+
+
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/IncludeModel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/PageInclude.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/PageInclude.java (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/PageInclude.java 2012-07-03 23:03:36 UTC (rev 42381)
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2012 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.jst.web.kb.include;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.common.el.core.resolver.Var;
+
+/**
+ *
+ * @author Viacheslav Kabanovich
+ *
+ */
+public class PageInclude {
+ IPath parent;
+ IPath path;
+ List<Var> vars;
+
+ public PageInclude(IPath parent, IPath path, List<Var> vars) {
+ this.parent = parent;
+ this.path = path;
+ this.vars = vars;
+ }
+
+ public IPath getParent() {
+ return parent;
+ }
+
+ public IPath getPath() {
+ return path;
+ }
+
+ public List<Var> getVars() {
+ return vars;
+ }
+}
Property changes on: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/include/PageInclude.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/FaceletPageContextImpl.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/FaceletPageContextImpl.java 2012-07-03 23:02:25 UTC (rev 42380)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/FaceletPageContextImpl.java 2012-07-03 23:03:36 UTC (rev 42381)
@@ -10,9 +10,12 @@
******************************************************************************/
package org.jboss.tools.jst.web.kb.internal;
+import java.util.List;
import java.util.Map;
+import org.jboss.tools.common.el.core.resolver.Var;
import org.jboss.tools.jst.web.kb.IFaceletPageContext;
+import org.jboss.tools.jst.web.kb.include.IncludeModel;
/**
* Facelet page context
@@ -23,6 +26,11 @@
private IFaceletPageContext parentContext;
private Map<String, String> params;
+ public List<Var> getExternalVars() {
+ List<Var> res = IncludeModel.getInstance().getVars(getResource().getFullPath());
+ return res == null ? super.getExternalVars() : res;
+ }
+
/* (non-Javadoc)
* @see org.jboss.tools.jst.web.kb.IFaceletPageContext#getParams()
*/
13 years, 9 months
JBoss Tools SVN: r42380 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-07-03 19:02:25 -0400 (Tue, 03 Jul 2012)
New Revision: 42380
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
Log:
JBIDE-3526
https://issues.jboss.org/browse/JBIDE-3526
Vars defined externally for a page.
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2012-07-03 22:27:16 UTC (rev 42379)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/ELContextImpl.java 2012-07-03 23:02:25 UTC (rev 42380)
@@ -11,6 +11,7 @@
package org.jboss.tools.common.el.core.resolver;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -24,6 +25,7 @@
* @author Alexey Kazakov
*/
public class ELContextImpl extends SimpleELContext {
+ static List<Var> EMPTY = Collections.<Var>emptyList();
protected List<Var> allVars = new ArrayList<Var>();
protected ELReference[] elReferences;
@@ -35,9 +37,22 @@
*/
@Override
public Var[] getVars() {
- return allVars.toArray(new Var[allVars.size()]);
+ List<Var> external = getExternalVars();
+ if(external.isEmpty()) {
+ return allVars.toArray(new Var[allVars.size()]);
+ } else if(allVars.isEmpty()) {
+ return external.toArray(new Var[allVars.size()]);
+ }
+ ArrayList<Var> result = new ArrayList<Var>();
+ result.addAll(allVars);
+ result.addAll(external);
+ return result.toArray(new Var[allVars.size()]);
}
+ public List<Var> getExternalVars() {
+ return EMPTY;
+ }
+
/**
* Adds new Var to the context
* @param region
@@ -64,6 +79,10 @@
result.add(var);
}
}
+ List<Var> external = getExternalVars();
+ if(!external.isEmpty()) {
+ result.addAll(external);
+ }
return result.toArray(new Var[result.size()]);
}
13 years, 9 months
JBoss Tools SVN: r42378 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-03 18:12:43 -0400 (Tue, 03 Jul 2012)
New Revision: 42378
Modified:
trunk/build/pom.xml
Log:
bump version of build/pom.xml to same as parent pom -- 3.4.0.M1-SNAPSHOT
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-07-03 21:57:06 UTC (rev 42377)
+++ trunk/build/pom.xml 2012-07-03 22:12:43 UTC (rev 42378)
@@ -11,7 +11,6 @@
<groupId>org.jboss.tools</groupId>
<artifactId>org.jboss.tools.build</artifactId>
<name>org.jboss.tools.build</name>
- <version>0.0.2</version>
<packaging>pom</packaging>
<profiles>
13 years, 9 months
JBoss Tools SVN: r42377 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-07-03 17:57:06 -0400 (Tue, 03 Jul 2012)
New Revision: 42377
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
Log:
JBIDE-12235 - Defining runtimes using external file - no error if the URL to config file is wrong
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-07-03 21:54:54 UTC (rev 42376)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/ProjectExamplesActivator.java 2012-07-03 21:57:06 UTC (rev 42377)
@@ -1224,6 +1224,7 @@
urlModified = ECFExamplesTransport.getInstance()
.getLastModified(url);
} catch (Exception e) {
+ log(e);
urlModified = -1;
}
if (cacheModified == 0 || urlModified != cacheModified) {
@@ -1240,6 +1241,8 @@
ProjectExamplesActivator.copyFile(tempFile, cacheFile);
tempFile.delete();
cacheFile.setLastModified(cacheModified);
+ } else {
+ getLog().log(status);
}
}
} catch (Exception e) {
13 years, 9 months
JBoss Tools SVN: r42376 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-07-03 17:54:54 -0400 (Tue, 03 Jul 2012)
New Revision: 42376
Modified:
trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java
Log:
JBIDE-12234 - Defining runtimes using external file - Invalid thread access when defined wrong URL to runtime
Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java
===================================================================
--- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java 2012-07-03 21:46:42 UTC (rev 42375)
+++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/dialog/DownloadRuntimeDialog.java 2012-07-03 21:54:54 UTC (rev 42376)
@@ -74,14 +74,14 @@
*/
public class DownloadRuntimeDialog extends Dialog {
- private static final String SEPARATOR = "/";
+ private static final String SEPARATOR = "/"; //$NON-NLS-1$
private static final String FOLDER_IS_REQUIRED = "This folder is required";
private static final String FOLDER_IS_NOT_WRITABLE = "This folder does not exist or is not writable";
- private static final String DELETE_ON_EXIT = "deleteOnExit";
- private static final String JAVA_IO_TMPDIR = "java.io.tmpdir";
- private static final String USER_HOME = "user.home";
- private static final String DEFAULT_DIALOG_PATH = "defaultDialogPath";
- private static final String DEFAULT_DESTINATION_PATH = "defaultDestinationPath";
+ private static final String DELETE_ON_EXIT = "deleteOnExit"; //$NON-NLS-1$
+ private static final String JAVA_IO_TMPDIR = "java.io.tmpdir"; //$NON-NLS-1$
+ private static final String USER_HOME = "user.home"; //$NON-NLS-1$
+ private static final String DEFAULT_DIALOG_PATH = "defaultDialogPath"; //$NON-NLS-1$
+ private static final String DEFAULT_DESTINATION_PATH = "defaultDestinationPath"; //$NON-NLS-1$
private IDialogSettings dialogSettings;
private Button deleteOnExit;
private Text destinationPathText;
@@ -410,13 +410,20 @@
File directory = new File(selectedDirectory);
directory.mkdirs();
if (!directory.isDirectory()) {
- String message = "The '" + directory + "' is not a directory.";
+ final String message = "The '" + directory + "' is not a directory.";
if (result != null) {
ProjectExamplesActivator.getDefault().getLog().log(result);
} else {
ProjectExamplesActivator.getDefault().getLog().log(result);
}
- MessageDialog.openError(getActiveShell(), "Error", message);
+ Display.getDefault().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ MessageDialog.openError(getActiveShell(), "Error", message);
+ }
+
+ });
file.deleteOnExit();
file.delete();
return Status.CANCEL_STATUS;
@@ -424,13 +431,15 @@
ProjectExamplesActivator.extractZipFile(file, directory, monitor);
if (result != null && !result.isOK()) {
ProjectExamplesActivator.getDefault().getLog().log(result);
- String message;
- if (result.getException() != null) {
- message = result.getException().getMessage();
- } else {
- message = result.getMessage();
- }
- MessageDialog.openError(getActiveShell(), "Error", message);
+ final String message = getMessage(result);
+ Display.getDefault().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ MessageDialog.openError(getActiveShell(), "Error", message);
+ }
+
+ });
file.deleteOnExit();
file.delete();
return Status.CANCEL_STATUS;
@@ -452,7 +461,15 @@
file.deleteOnExit();
file.delete();
}
- MessageDialog.openError(getActiveShell(), "Error", e.getMessage());
+ final String message = e.getMessage();
+ Display.getDefault().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ MessageDialog.openError(getActiveShell(), "Error", message);
+ }
+
+ });
} finally {
if (in != null) {
try {
@@ -471,6 +488,16 @@
}
return Status.OK_STATUS;
}
+
+ private String getMessage(IStatus result) {
+ String message;
+ if (result.getException() != null) {
+ message = result.getException().getMessage();
+ } else {
+ message = result.getMessage();
+ }
+ return message;
+ }
private String getRoot(File file, IProgressMonitor monitor) {
ZipFile zipFile = null;
13 years, 9 months
JBoss Tools SVN: r42375 - in branches/jbosstools-3.3.x/examples: features and 14 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-07-03 17:46:42 -0400 (Tue, 03 Jul 2012)
New Revision: 42375
Modified:
branches/jbosstools-3.3.x/examples/features/org.jboss.tools.community.project.examples.feature/feature.xml
branches/jbosstools-3.3.x/examples/features/org.jboss.tools.community.project.examples.feature/pom.xml
branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.feature/feature.xml
branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.feature/pom.xml
branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.test.feature/feature.xml
branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.test.feature/pom.xml
branches/jbosstools-3.3.x/examples/features/pom.xml
branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.community.project.examples/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.community.project.examples/pom.xml
branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples.cheatsheet/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples.cheatsheet/pom.xml
branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/pom.xml
branches/jbosstools-3.3.x/examples/plugins/pom.xml
branches/jbosstools-3.3.x/examples/pom.xml
branches/jbosstools-3.3.x/examples/site/pom.xml
branches/jbosstools-3.3.x/examples/tests/org.jboss.tools.project.examples.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/examples/tests/org.jboss.tools.project.examples.test/pom.xml
branches/jbosstools-3.3.x/examples/tests/pom.xml
Log:
JBDS-2212 apply ~/Screenshots/JBDS2212-examples-upversion-33x.patch to upversion to 1.3.1
Modified: branches/jbosstools-3.3.x/examples/features/org.jboss.tools.community.project.examples.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/features/org.jboss.tools.community.project.examples.feature/feature.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/features/org.jboss.tools.community.project.examples.feature/feature.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.community.project.examples.feature"
label="JBoss Tools Community Project Examples"
- version="1.2.1.qualifier"
+ version="1.3.1.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.community.project.examples">
Modified: branches/jbosstools-3.3.x/examples/features/org.jboss.tools.community.project.examples.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/features/org.jboss.tools.community.project.examples.feature/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/features/org.jboss.tools.community.project.examples.feature/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>features</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples.features</groupId>
<artifactId>org.jboss.tools.community.project.examples.feature</artifactId>
Modified: branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.feature/feature.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.feature/feature.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.project.examples.feature"
label="%featureName"
- version="1.2.1.qualifier"
+ version="1.3.1.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.project.examples">
Modified: branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.feature/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.feature/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>features</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples.features</groupId>
<artifactId>org.jboss.tools.project.examples.feature</artifactId>
Modified: branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.test.feature/feature.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.test.feature/feature.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.project.examples.test.feature" label="JBoss Tools - Tests - Project Examples" version="1.2.1.qualifier" provider-name="JBoss by Red Hat">
+<feature id="org.jboss.tools.project.examples.test.feature" label="JBoss Tools - Tests - Project Examples" version="1.3.1.qualifier" provider-name="JBoss by Red Hat">
<description>
%description
Modified: branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.test.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.test.feature/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/features/org.jboss.tools.project.examples.test.feature/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>features</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples.features</groupId>
<artifactId>org.jboss.tools.project.examples.test.feature</artifactId>
Modified: branches/jbosstools-3.3.x/examples/features/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/features/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/features/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>examples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>features</artifactId>
Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.community.project.examples/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.community.project.examples/META-INF/MANIFEST.MF 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.community.project.examples/META-INF/MANIFEST.MF 2012-07-03 21:46:42 UTC (rev 42375)
@@ -1,8 +1,8 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %BundleName
-Bundle-SymbolicName: org.jboss.tools.community.project.examples;singleton:=true
-Bundle-Version: 1.2.1.qualifier
-Bundle-Vendor: %BundleVendor
-Bundle-Localization: plugin
-Require-Bundle: org.jboss.tools.project.examples
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %BundleName
+Bundle-SymbolicName: org.jboss.tools.community.project.examples;singleton:=true
+Bundle-Version: 1.3.1.qualifier
+Bundle-Vendor: %BundleVendor
+Bundle-Localization: plugin
+Require-Bundle: org.jboss.tools.project.examples
Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.community.project.examples/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.community.project.examples/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.community.project.examples/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>plugins</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples.plugins</groupId>
<artifactId>org.jboss.tools.community.project.examples</artifactId>
Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/META-INF/MANIFEST.MF 2012-07-03 21:46:42 UTC (rev 42375)
@@ -1,58 +1,58 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %BundleName
-Bundle-SymbolicName: org.jboss.tools.project.examples;singleton:=true
-Bundle-Version: 1.2.1.qualifier
-Bundle-Activator: org.jboss.tools.project.examples.ProjectExamplesActivator
-Bundle-Vendor: %BundleVendor
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.osgi,
- org.eclipse.ecf,
- org.eclipse.ecf.filetransfer,
- org.eclipse.equinox.common,
- org.eclipse.ecf.provider.filetransfer,
- org.eclipse.equinox.security,
- org.eclipse.equinox.p2.engine,
- org.eclipse.equinox.p2.core,
- org.eclipse.ui.ide,
- org.eclipse.wst.validation,
- org.eclipse.ui.views,
- org.eclipse.ui.cheatsheets,
- org.eclipse.jdt.core,
- org.eclipse.wst.server.core,
- org.jboss.tools.seam.core,
- org.eclipse.wst.common.project.facet.core,
- org.jboss.tools.common,
- org.eclipse.equinox.p2.ui,
- org.eclipse.equinox.p2.ui.sdk,
- org.eclipse.equinox.p2.metadata,
- org.jboss.tools.portlet.core,
- org.eclipse.equinox.p2.operations,
- org.eclipse.jst.server.core,
- org.eclipse.core.filesystem;bundle-version="1.3.100",
- org.jboss.tools.runtime.core,
- org.jboss.tools.runtime.ui,
- org.eclipse.mylyn.commons.core;bundle-version="3.6.0",
- org.eclipse.mylyn.discovery.ui;bundle-version="3.6.0",
- org.eclipse.mylyn.discovery.core;bundle-version="3.6.0",
- org.eclipse.mylyn.commons.ui;bundle-version="[3.6.0,3.8.0)",
- org.apache.commons.lang;bundle-version="2.4.0",
- org.eclipse.jdt.ui;bundle-version="3.7.1"
-Bundle-ActivationPolicy: lazy
-Bundle-Localization: plugin
-Export-Package: org.jboss.tools.project.examples,
- org.jboss.tools.project.examples.actions,
- org.jboss.tools.project.examples.configurators,
- org.jboss.tools.project.examples.dialog,
- org.jboss.tools.project.examples.dialog.xpl,
- org.jboss.tools.project.examples.filetransfer,
- org.jboss.tools.project.examples.fixes,
- org.jboss.tools.project.examples.model,
- org.jboss.tools.project.examples.preferences,
- org.jboss.tools.project.examples.runtimes,
- org.jboss.tools.project.examples.wizard
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Service-Component: OSGI-INF/downloadRuntime.xml
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %BundleName
+Bundle-SymbolicName: org.jboss.tools.project.examples;singleton:=true
+Bundle-Version: 1.3.1.qualifier
+Bundle-Activator: org.jboss.tools.project.examples.ProjectExamplesActivator
+Bundle-Vendor: %BundleVendor
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.jface,
+ org.eclipse.osgi,
+ org.eclipse.ecf,
+ org.eclipse.ecf.filetransfer,
+ org.eclipse.equinox.common,
+ org.eclipse.ecf.provider.filetransfer,
+ org.eclipse.equinox.security,
+ org.eclipse.equinox.p2.engine,
+ org.eclipse.equinox.p2.core,
+ org.eclipse.ui.ide,
+ org.eclipse.wst.validation,
+ org.eclipse.ui.views,
+ org.eclipse.ui.cheatsheets,
+ org.eclipse.jdt.core,
+ org.eclipse.wst.server.core,
+ org.jboss.tools.seam.core,
+ org.eclipse.wst.common.project.facet.core,
+ org.jboss.tools.common,
+ org.eclipse.equinox.p2.ui,
+ org.eclipse.equinox.p2.ui.sdk,
+ org.eclipse.equinox.p2.metadata,
+ org.jboss.tools.portlet.core,
+ org.eclipse.equinox.p2.operations,
+ org.eclipse.jst.server.core,
+ org.eclipse.core.filesystem;bundle-version="1.3.100",
+ org.jboss.tools.runtime.core,
+ org.jboss.tools.runtime.ui,
+ org.eclipse.mylyn.commons.core;bundle-version="3.6.0",
+ org.eclipse.mylyn.discovery.ui;bundle-version="3.6.0",
+ org.eclipse.mylyn.discovery.core;bundle-version="3.6.0",
+ org.eclipse.mylyn.commons.ui;bundle-version="[3.6.0,3.8.0)",
+ org.apache.commons.lang;bundle-version="2.4.0",
+ org.eclipse.jdt.ui;bundle-version="3.7.1"
+Bundle-ActivationPolicy: lazy
+Bundle-Localization: plugin
+Export-Package: org.jboss.tools.project.examples,
+ org.jboss.tools.project.examples.actions,
+ org.jboss.tools.project.examples.configurators,
+ org.jboss.tools.project.examples.dialog,
+ org.jboss.tools.project.examples.dialog.xpl,
+ org.jboss.tools.project.examples.filetransfer,
+ org.jboss.tools.project.examples.fixes,
+ org.jboss.tools.project.examples.model,
+ org.jboss.tools.project.examples.preferences,
+ org.jboss.tools.project.examples.runtimes,
+ org.jboss.tools.project.examples.wizard
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Service-Component: OSGI-INF/downloadRuntime.xml
Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>plugins</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples.plugins</groupId>
<artifactId>org.jboss.tools.project.examples</artifactId>
Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples.cheatsheet/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples.cheatsheet/META-INF/MANIFEST.MF 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples.cheatsheet/META-INF/MANIFEST.MF 2012-07-03 21:46:42 UTC (rev 42375)
@@ -1,30 +1,30 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %BundleName
-Bundle-SymbolicName: org.jboss.tools.project.examples.cheatsheet;singleton:=true
-Bundle-Version: 1.2.1.qualifier
-Bundle-Activator: org.jboss.tools.project.examples.cheatsheet.Activator
-Bundle-Vendor: %BundleVendor
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.ui.cheatsheets;bundle-version="3.4.100",
- org.eclipse.jdt.core;bundle-version="3.7.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
- org.eclipse.text;bundle-version="3.5.100",
- org.jboss.tools.jst.jsp,
- org.eclipse.wst.sse.ui;bundle-version="1.3.0",
- org.jboss.tools.common.text.ext,
- org.jboss.tools.common,
- org.jboss.tools.common.model,
- org.jboss.tools.common.model.ui,
- org.jboss.tools.project.examples,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.jboss.ide.eclipse.as.core,
- org.eclipse.jdt.junit;bundle-version="3.7.0",
- org.eclipse.debug.core;bundle-version="3.7.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %BundleName
+Bundle-SymbolicName: org.jboss.tools.project.examples.cheatsheet;singleton:=true
+Bundle-Version: 1.3.1.qualifier
+Bundle-Activator: org.jboss.tools.project.examples.cheatsheet.Activator
+Bundle-Vendor: %BundleVendor
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
+ org.eclipse.core.runtime;bundle-version="3.7.0",
+ org.eclipse.ui.cheatsheets;bundle-version="3.4.100",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.core.resources;bundle-version="3.7.0",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.ui.workbench.texteditor;bundle-version="3.7.0",
+ org.eclipse.text;bundle-version="3.5.100",
+ org.jboss.tools.jst.jsp,
+ org.eclipse.wst.sse.ui;bundle-version="1.3.0",
+ org.jboss.tools.common.text.ext,
+ org.jboss.tools.common,
+ org.jboss.tools.common.model,
+ org.jboss.tools.common.model.ui,
+ org.jboss.tools.project.examples,
+ org.eclipse.wst.server.core,
+ org.eclipse.wst.server.ui,
+ org.jboss.ide.eclipse.as.core,
+ org.eclipse.jdt.junit;bundle-version="3.7.0",
+ org.eclipse.debug.core;bundle-version="3.7.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
Modified: branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples.cheatsheet/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples.cheatsheet/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/plugins/org.jboss.tools.project.examples.cheatsheet/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>plugins</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples.plugins</groupId>
<artifactId>org.jboss.tools.project.examples.cheatsheet</artifactId>
Modified: branches/jbosstools-3.3.x/examples/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/plugins/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/plugins/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>examples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>plugins</artifactId>
Modified: branches/jbosstools-3.3.x/examples/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -10,7 +10,7 @@
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>examples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
<name>examples.all</name>
<packaging>pom</packaging>
<modules>
Modified: branches/jbosstools-3.3.x/examples/site/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/site/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/site/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>examples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>examples.site</artifactId>
Modified: branches/jbosstools-3.3.x/examples/tests/org.jboss.tools.project.examples.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/examples/tests/org.jboss.tools.project.examples.test/META-INF/MANIFEST.MF 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/tests/org.jboss.tools.project.examples.test/META-INF/MANIFEST.MF 2012-07-03 21:46:42 UTC (rev 42375)
@@ -1,39 +1,39 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %BundleName
-Bundle-SymbolicName: org.jboss.tools.project.examples.test;singleton:=true
-Bundle-Version: 1.2.1.qualifier
-Require-Bundle: org.eclipse.core.runtime,
- org.jboss.tools.tests,
- org.jboss.tools.project.examples,
- org.jboss.tools.community.project.examples,
- org.jboss.tools.project.examples.cheatsheet,
- org.jboss.tools.seam.core,
- org.eclipse.datatools.connectivity,
- org.eclipse.datatools.connectivity.db.generic,
- org.jboss.tools.common,
- org.jboss.tools.tests,
- org.jboss.ide.eclipse.as.core,
- org.eclipse.wst.server.core,
- org.eclipse.datatools.enablement.hsqldb,
- org.eclipse.datatools.enablement.hsqldb.dbdefinition,
- org.eclipse.datatools.enablement.hsqldb.ui,
- org.eclipse.jst.jee,
- org.eclipse.jst.jee.ejb,
- org.eclipse.jst.jee.ui,
- org.eclipse.jst.jee.web,
- org.eclipse.ui,
- org.eclipse.core.resources,
- org.junit4,
- org.jboss.tools.jsf.vpe.seam,
- org.jboss.tools.seam.pages.xml,
- org.jboss.tools.seam.ui,
- org.jboss.tools.seam.ui.pages,
- org.jboss.tools.seam.xml,
- org.jboss.tools.seam.xml.ui,
- org.jboss.tools.seam.text.ext
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.jboss.tools.project.examples.test
-Bundle-Vendor: %BundleVendor
-Bundle-Localization: plugin
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %BundleName
+Bundle-SymbolicName: org.jboss.tools.project.examples.test;singleton:=true
+Bundle-Version: 1.3.1.qualifier
+Require-Bundle: org.eclipse.core.runtime,
+ org.jboss.tools.tests,
+ org.jboss.tools.project.examples,
+ org.jboss.tools.community.project.examples,
+ org.jboss.tools.project.examples.cheatsheet,
+ org.jboss.tools.seam.core,
+ org.eclipse.datatools.connectivity,
+ org.eclipse.datatools.connectivity.db.generic,
+ org.jboss.tools.common,
+ org.jboss.tools.tests,
+ org.jboss.ide.eclipse.as.core,
+ org.eclipse.wst.server.core,
+ org.eclipse.datatools.enablement.hsqldb,
+ org.eclipse.datatools.enablement.hsqldb.dbdefinition,
+ org.eclipse.datatools.enablement.hsqldb.ui,
+ org.eclipse.jst.jee,
+ org.eclipse.jst.jee.ejb,
+ org.eclipse.jst.jee.ui,
+ org.eclipse.jst.jee.web,
+ org.eclipse.ui,
+ org.eclipse.core.resources,
+ org.junit4,
+ org.jboss.tools.jsf.vpe.seam,
+ org.jboss.tools.seam.pages.xml,
+ org.jboss.tools.seam.ui,
+ org.jboss.tools.seam.ui.pages,
+ org.jboss.tools.seam.xml,
+ org.jboss.tools.seam.xml.ui,
+ org.jboss.tools.seam.text.ext
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.jboss.tools.project.examples.test
+Bundle-Vendor: %BundleVendor
+Bundle-Localization: plugin
Modified: branches/jbosstools-3.3.x/examples/tests/org.jboss.tools.project.examples.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/tests/org.jboss.tools.project.examples.test/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/tests/org.jboss.tools.project.examples.test/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>tests</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples.tests</groupId>
<artifactId>org.jboss.tools.project.examples.test</artifactId>
Modified: branches/jbosstools-3.3.x/examples/tests/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/examples/tests/pom.xml 2012-07-03 21:46:11 UTC (rev 42374)
+++ branches/jbosstools-3.3.x/examples/tests/pom.xml 2012-07-03 21:46:42 UTC (rev 42375)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>examples</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.3.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.examples</groupId>
<artifactId>tests</artifactId>
13 years, 9 months