JBoss Tools SVN: r43717 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:42:51 -0400 (Fri, 14 Sep 2012)
New Revision: 43717
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:40:01 UTC (rev 43716)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:42:51 UTC (rev 43717)
@@ -116,11 +116,12 @@
echo "" | tee -a $log
}
+# determine the number of items in a space-separated list
getListSize ()
{
- # need count of children
+ list=$1
getListSizeReturn=0;
- for ssd in $subsubdirs; do
+ for item in $list; do
let getListSizeReturn=getListSizeReturn+1;
done
}
13 years, 3 months
JBoss Tools SVN: r43716 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:40:01 -0400 (Fri, 14 Sep 2012)
New Revision: 43716
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:39:40 UTC (rev 43715)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:40:01 UTC (rev 43716)
@@ -88,12 +88,24 @@
# generate metadata in the nightly/core/trunk/ folder to composite the remaining sites into one
getSubDirs $sd 1; #return #getSubDirsReturn
- getSubDirsCount $getSubDirsReturn; #return $getSubDirsCountReturn
- if [[ $getSubDirsCountReturn -gt 0 ]]; then
- echo "Generate metadata ${getSubDirsCountReturn} subdirs in $sd/" | tee -a $log
+ subsubdirs=$getSubDirsReturn
+ #echo $subsubdirs
+ tmp=`mktemp`
+ for ssd in $subsubdirs; do
+ if [[ ${ssd##$sd/201*} == "" ]]; then # a build dir
+ buildid=${ssd##*/};
+ echo $buildid >> $tmp
+ fi
+ done
+ all=$(cat $tmp | sort -r) # check these
+ rm -f $tmp
+
+ getListSize $all; #return $getListSizeReturn
+ if [[ $getListSizeReturn -gt 0 ]]; then
+ echo "Generate metadata for ${getListSizeReturn} subdir(s) in $sd/" | tee -a $log
mkdir -p /tmp/cleanup-fresh-metadata/
- regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
- regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml"
+ regenCompositeMetadata "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
+ regenCompositeMetadata "$all" "$getListSizeReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml"
rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/
rm -fr /tmp/cleanup-fresh-metadata/
else
@@ -104,12 +116,12 @@
echo "" | tee -a $log
}
-getSubDirsCount ()
+getListSize ()
{
# need count of children
- getSubDirsCountReturn=0;
+ getListSizeReturn=0;
for ssd in $subsubdirs; do
- let getSubDirsCountReturn=getSubDirsCountReturn+1;
+ let getListSizeReturn=getListSizeReturn+1;
done
}
13 years, 3 months
JBoss Tools SVN: r43715 - in trunk: common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-09-14 15:39:40 -0400 (Fri, 14 Sep 2012)
New Revision: 43715
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/varAttributes.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/WEB-INF/classes/resources.properties
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/WEB-INF/lib/jsf-api-2.jar
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
Log:
https://issues.jboss.org/browse/JBIDE-12614 Code completion on item with h:dataTable fails if value point on datamodel object
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-09-14 19:32:32 UTC (rev 43714)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca/AbstractELCompletionEngine.java 2012-09-14 19:39:40 UTC (rev 43715)
@@ -265,7 +265,7 @@
try {
if(TypeInfoCollector.isInstanceofType(type, "java.util.Map")) { //$NON-NLS-1$
suffix = collectionAdditionForMapDataModel;
- } else if(TypeInfoCollector.isInstanceofType(type, "java.util.Collection")) { //$NON-NLS-1$
+ } else if(TypeInfoCollector.isInstanceofType(type, "java.lang.Iterable")) { //$NON-NLS-1$
suffix = collectionAdditionForCollectionDataModel;
}
} catch (JavaModelException e) {
@@ -668,7 +668,7 @@
}
}
segment = lastSegment;
- } else if(TypeInfoCollector.isInstanceofType(type, "java.util.Collection")) { //$NON-NLS-1$
+ } else if(TypeInfoCollector.isInstanceofType(type, "java.lang.Iterable")) { //$NON-NLS-1$
skipSegment = true;
String s = "#{" + left.getLeft().toString() + collectionAdditionForCollectionDataModel + "}"; //$NON-NLS-1$ //$NON-NLS-2$
if(getParserFactory()!=null) {
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-09-14 19:32:32 UTC (rev 43714)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-09-14 19:39:40 UTC (rev 43715)
@@ -875,7 +875,7 @@
}
IType type = mbr.getMemberType();
if(type!=null) {
- return isInstanceofType(type, "java.util.Map") || isInstanceofType(type, "java.util.Collection"); //$NON-NLS-1$ //$NON-NLS-2$
+ return isInstanceofType(type, "java.util.Map") || isInstanceofType(type, "java.lang.Iterable"); //$NON-NLS-1$ //$NON-NLS-2$
}
return false;
} catch (JavaModelException e) {
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs 2012-09-14 19:39:40 UTC (rev 43715)
@@ -0,0 +1,9 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.jboss.tools.common.validation.ValidatorManager;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.jboss.tools.common.validation.ValidatorManager;
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.400.v201204260100
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.jst.jsf.facelet.ui.FaceletHTMLValidator/global=FF01
+vf.version=3
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/.settings/org.eclipse.wst.validation.prefs
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java 2012-09-14 19:39:40 UTC (rev 43715)
@@ -0,0 +1,52 @@
+package demo;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.faces.bean.ManagedBean;
+import javax.faces.model.DataModel;
+
+@ManagedBean
+public class TestBeanForVarAttributes {
+
+ public Test getTest() {
+ return null;
+ }
+
+ public List<Value> getList() {
+ return null;
+ }
+
+ public Set<Value> getSet() {
+ return null;
+ }
+
+ public Map<String, Value> getMap() {
+ return null;
+ }
+
+ public Iterable<Value> getIterable() {
+ return null;
+ }
+
+ public Value[] getArray() {
+ return null;
+ }
+
+ public DataModel<Value> getListDM() {
+ return null;
+ }
+
+ public static class Value {
+ public String getName() {
+ return null;
+ }
+ }
+
+ public static class Test {
+ public List<Value> getItems() {
+ return null;
+ }
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/JavaSource/demo/TestBeanForVarAttributes.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/WEB-INF/classes/resources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/WEB-INF/classes/resources.properties 2012-09-14 19:32:32 UTC (rev 43714)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/WEB-INF/classes/resources.properties 2012-09-14 19:39:40 UTC (rev 43715)
@@ -1,2 +0,0 @@
-prompt=Your Name\:
-greeting=Hello
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/WEB-INF/lib/jsf-api-2.jar
===================================================================
(Binary files differ)
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/varAttributes.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/varAttributes.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/jsf2pr/WebContent/varAttributes.xhtml 2012-09-14 19:39:40 UTC (rev 43715)
@@ -0,0 +1,47 @@
+<!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"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+
+ <h:dataTable value="#{testBeanForVarAttributes.test}" var="testItem">
+ <h:dataTable value="#{testItem.items}" var="test">
+ <h:outputText value="#{test.name}"/>
+ <h:outputText value="#{test.broken}"/>
+ </h:dataTable>
+ <h:outputText value="#{testItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.map}" var="mapItem">
+ <h:outputText value="#{mapItem.value.name}"/>
+ <h:outputText value="#{mapItem.key.bytes}"/>
+ <h:outputText value="#{mapItem.broken}"/>
+ <h:outputText value="#{mapItem.value.broken}"/>
+ <h:outputText value="#{mapItem.key.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.array}" var="arrayItem">
+ <h:outputText value="#{arrayItem.name}"/>
+ <h:outputText value="#{arrayItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.iterable}" var="iterableItem">
+ <h:outputText value="#{iterableItem.name}"/>
+ <h:outputText value="#{iterableItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.list}" var="listItem">
+ <h:outputText value="#{listItem.name}"/>
+ <h:outputText value="#{listItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.listDM}" var="dmItem">
+ <h:outputText value="#{dmItem.name}"/>
+ <h:outputText value="#{dmItem.broken}"/>
+ </h:dataTable>
+
+ <h:dataTable value="#{testBeanForVarAttributes.set}" var="setItem">
+ <h:outputText value="#{setItem.name}"/>
+ <h:outputText value="#{setItem.broken}"/>
+ </h:dataTable>
+
+</html>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-09-14 19:32:32 UTC (rev 43714)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2012-09-14 19:39:40 UTC (rev 43715)
@@ -29,6 +29,7 @@
import org.jboss.tools.jsf.test.validation.FacesConfigValidatorTest;
import org.jboss.tools.jsf.test.validation.JSF2ComponentsInClassFolderTest;
import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest;
+import org.jboss.tools.jsf.test.validation.VarAttributesTest;
import org.jboss.tools.jsf.test.validation.WebContentTest;
import org.jboss.tools.jsf.test.validation.XHTMLDetectorAndValidatorTest;
import org.jboss.tools.jsf.test.validation.XHTMLValidatorTest;
@@ -107,6 +108,7 @@
// new String[] { "i18nTestProject" })); //$NON-NLS-1$
suite.addTest(new ValidationProjectTestSetup(new TestSuite(ELValidatorTest.class),"org.jboss.tools.jsf.test","projects/JSFKickStartOldFormat","JSFKickStartOldFormat"));
suite.addTest(new ValidationProjectTestSetup(new TestSuite(BuilderValidationTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr"));
+ suite.addTest(new ValidationProjectTestSetup(new TestSuite(VarAttributesTest.class),"org.jboss.tools.jsf.test","projects/jsf2pr","jsf2pr"));
suite.addTestSuite(ValidationExceptionTest.class); // This test should be added last!
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java 2012-09-14 19:39:40 UTC (rev 43715)
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * 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.jsf.test.validation;
+
+import java.text.MessageFormat;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
+import org.jboss.tools.tests.AbstractResourceMarkerTest;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class VarAttributesTest extends TestCase {
+
+ IProject project;
+ IFile xhtml;
+ String messageBroken = MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"broken"});
+ String messageOk = MessageFormat.format(ELValidationMessages.UNKNOWN_EL_VARIABLE_PROPERTY_NAME, new Object[]{"name"});
+
+ @Override
+ protected void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject("jsf2pr");
+ xhtml = project.getFile("WebContent/varAttributes.xhtml");
+ }
+
+ public void testBroken() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsCreated(xhtml, messageBroken, 9, 11, 17, 18, 19, 24, 29, 34, 39, 44);
+ }
+
+ public void testInnerClass() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, messageOk, 8);
+ }
+
+ public void testMap() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, messageOk, 15);
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, messageOk, 16);
+ }
+
+ public void testArray() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, messageOk, 23);
+ }
+
+ public void testIterable() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, messageOk, 28);
+ }
+
+ public void testList() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, messageOk, 33);
+ }
+
+ public void testDataModel() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, messageOk, 38);
+ }
+
+ public void testSet() throws Exception {
+ AbstractResourceMarkerTest.assertMarkerIsNotCreated(xhtml, messageOk, 43);
+ }
+}
\ No newline at end of file
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/VarAttributesTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 3 months
JBoss Tools SVN: r43714 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:32:32 -0400 (Fri, 14 Sep 2012)
New Revision: 43714
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:31:31 UTC (rev 43713)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:32:32 UTC (rev 43714)
@@ -107,6 +107,7 @@
getSubDirsCount ()
{
# need count of children
+ getSubDirsCountReturn=0;
for ssd in $subsubdirs; do
let getSubDirsCountReturn=getSubDirsCountReturn+1;
done
13 years, 3 months
JBoss Tools SVN: r43713 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:31:31 -0400 (Fri, 14 Sep 2012)
New Revision: 43713
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:30:28 UTC (rev 43712)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:31:31 UTC (rev 43713)
@@ -89,7 +89,7 @@
# generate metadata in the nightly/core/trunk/ folder to composite the remaining sites into one
getSubDirs $sd 1; #return #getSubDirsReturn
getSubDirsCount $getSubDirsReturn; #return $getSubDirsCountReturn
- if [[ $getSubDirsCountReturn -gt 0 ]];
+ if [[ $getSubDirsCountReturn -gt 0 ]]; then
echo "Generate metadata ${getSubDirsCountReturn} subdirs in $sd/" | tee -a $log
mkdir -p /tmp/cleanup-fresh-metadata/
regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
@@ -99,7 +99,6 @@
else
echo "No subdirs found in $sd/" | tee -a $log
# TODO delete composite*.xml from $sd/ folder if there are no subdirs present
-
fi
done
echo "" | tee -a $log
13 years, 3 months
JBoss Tools SVN: r43712 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:30:28 -0400 (Fri, 14 Sep 2012)
New Revision: 43712
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:27:34 UTC (rev 43711)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:30:28 UTC (rev 43712)
@@ -90,13 +90,16 @@
getSubDirs $sd 1; #return #getSubDirsReturn
getSubDirsCount $getSubDirsReturn; #return $getSubDirsCountReturn
if [[ $getSubDirsCountReturn -gt 0 ]];
+ echo "Generate metadata ${getSubDirsCountReturn} subdirs in $sd/" | tee -a $log
mkdir -p /tmp/cleanup-fresh-metadata/
regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml"
rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/
rm -fr /tmp/cleanup-fresh-metadata/
else
+ echo "No subdirs found in $sd/" | tee -a $log
# TODO delete composite*.xml from $sd/ folder if there are no subdirs present
+
fi
done
echo "" | tee -a $log
13 years, 3 months
JBoss Tools SVN: r43711 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:27:34 -0400 (Fri, 14 Sep 2012)
New Revision: 43711
Modified:
trunk/build/util/cleanup/devstudio-product-cleanup.sh
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org
Modified: trunk/build/util/cleanup/devstudio-product-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/devstudio-product-cleanup.sh 2012-09-14 19:23:57 UTC (rev 43710)
+++ trunk/build/util/cleanup/devstudio-product-cleanup.sh 2012-09-14 19:27:34 UTC (rev 43711)
@@ -1,6 +1,6 @@
#!/bin/bash
# This script is run here: http://hudson.qa.jboss.com/hudson/job/devstudio-cleanup/configure
-# And archived here: https://svn.jboss.org/repos/devstudio/trunk/releng/org.jboss.ide.eclipse....
+# And archived here: http://anonsvn.jboss.org/repos/jbosstools/trunk/build/util/cleanup/devstu...
# --------------------------------------------------------------------------------
# clean JBDS builds from fish://dev01.qa.atl2.redhat.com:/qa/services/http/binaries/RHDS/{nightly,release}
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:23:57 UTC (rev 43710)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:27:34 UTC (rev 43711)
@@ -89,11 +89,15 @@
# generate metadata in the nightly/core/trunk/ folder to composite the remaining sites into one
getSubDirs $sd 1; #return #getSubDirsReturn
getSubDirsCount $getSubDirsReturn; #return $getSubDirsCountReturn
- mkdir -p /tmp/cleanup-fresh-metadata/
- regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
- regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml"
- rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/
- rm -fr /tmp/cleanup-fresh-metadata/
+ if [[ $getSubDirsCountReturn -gt 0 ]];
+ mkdir -p /tmp/cleanup-fresh-metadata/
+ regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
+ regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml"
+ rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/
+ rm -fr /tmp/cleanup-fresh-metadata/
+ else
+ # TODO delete composite*.xml from $sd/ folder if there are no subdirs present
+ fi
done
echo "" | tee -a $log
}
13 years, 3 months
JBoss Tools SVN: r43710 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:23:57 -0400 (Fri, 14 Sep 2012)
New Revision: 43710
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
wrap in quotes\?
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:15:46 UTC (rev 43709)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:23:57 UTC (rev 43710)
@@ -90,8 +90,8 @@
getSubDirs $sd 1; #return #getSubDirsReturn
getSubDirsCount $getSubDirsReturn; #return $getSubDirsCountReturn
mkdir -p /tmp/cleanup-fresh-metadata/
- regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository /tmp/cleanup-fresh-metadata/compositeContent.xml
- regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository /tmp/cleanup-fresh-metadata/compositeArtifacts.xml
+ regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" "/tmp/cleanup-fresh-metadata/compositeContent.xml"
+ regenCompositeMetadata "$getSubDirsReturn" "$getSubDirsCountReturn" "org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" "/tmp/cleanup-fresh-metadata/compositeArtifacts.xml"
rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/
rm -fr /tmp/cleanup-fresh-metadata/
done
@@ -122,8 +122,7 @@
for ssd in $subsubdirs; do
echo "<child location='${ssd}/all/repo/'/>" >> ${fileName}
done
-echo "
-</children>
+ echo "</children>
</repository>
" >> ${fileName}
}
13 years, 3 months
JBoss Tools SVN: r43709 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:15:46 -0400 (Fri, 14 Sep 2012)
New Revision: 43709
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:13:04 UTC (rev 43708)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:15:46 UTC (rev 43709)
@@ -76,7 +76,7 @@
if [[ $USER == "hudson" ]]; then
# can't delete the dir, but can at least purge its contents
rm -fr /tmp/$dd; mkdir /tmp/$dd; pushd /tmp/$dd >/dev/null
- rsync -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log
+ rsync --rsh=ssh --protocol=28 -r --delete . tools@filemgmt.jboss.org:$sd/$dd 2>&1 | tee -a $log
echo -e "rmdir $dd" | sftp tools@filemgmt.jboss.org:$sd/
popd >/dev/null; rm -fr /tmp/$dd
fi
@@ -92,13 +92,13 @@
mkdir -p /tmp/cleanup-fresh-metadata/
regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository /tmp/cleanup-fresh-metadata/compositeContent.xml
regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository /tmp/cleanup-fresh-metadata/compositeArtifacts.xml
- rsync -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/
+ rsync --rsh=ssh --protocol=28 -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/
rm -fr /tmp/cleanup-fresh-metadata/
done
echo "" | tee -a $log
}
-getSubDirCount ()
+getSubDirsCount ()
{
# need count of children
for ssd in $subsubdirs; do
13 years, 3 months
JBoss Tools SVN: r43708 - trunk/build/util/cleanup.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-09-14 15:13:04 -0400 (Fri, 14 Sep 2012)
New Revision: 43708
Modified:
trunk/build/util/cleanup/jbosstools-cleanup.sh
Log:
publish new composite*.xml files to correct folder on download.jb.org
Modified: trunk/build/util/cleanup/jbosstools-cleanup.sh
===================================================================
--- trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:12:57 UTC (rev 43707)
+++ trunk/build/util/cleanup/jbosstools-cleanup.sh 2012-09-14 19:13:04 UTC (rev 43708)
@@ -85,11 +85,15 @@
echo "+ $sd/$dd (${day}d)" | tee -a $log
fi
done
+
+ # generate metadata in the nightly/core/trunk/ folder to composite the remaining sites into one
getSubDirs $sd 1; #return #getSubDirsReturn
getSubDirsCount $getSubDirsReturn; #return $getSubDirsCountReturn
- regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository compositeContent.xml
- regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository compositeArtifacts.xml
-
+ mkdir -p /tmp/cleanup-fresh-metadata/
+ regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository /tmp/cleanup-fresh-metadata/compositeContent.xml
+ regenCompositeMetadata $getSubDirsReturn $getSubDirsCountReturn org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository /tmp/cleanup-fresh-metadata/compositeArtifacts.xml
+ rsync -q /tmp/cleanup-fresh-metadata/composite*.xml tools@filemgmt.jboss.org:$sd/
+ rm -fr /tmp/cleanup-fresh-metadata/
done
echo "" | tee -a $log
}
13 years, 3 months