JBoss Tools SVN: r41023 - in trunk/maven: tests/org.jboss.tools.maven.configurators.tests/META-INF and 4 other directories.
by jbosstools-commits@lists.jboss.org
Author: fbricon
Date: 2012-05-15 08:25:08 -0400 (Tue, 15 May 2012)
New Revision: 41023
Added:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/cdi/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/cdi/deltaspike/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/cdi/deltaspike/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/CDIConfiguratorTest.java
Modified:
trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF
Log:
JBIDE-11741 : enable CDI support on maven projects having a DeltaSpike dependency
Modified: trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java 2012-05-15 11:47:40 UTC (rev 41022)
+++ trunk/maven/plugins/org.jboss.tools.maven.cdi/src/org/jboss/tools/maven/cdi/configurators/CDIProjectConfigurator.java 2012-05-15 12:25:08 UTC (rev 41023)
@@ -182,8 +182,11 @@
}
private boolean isKnownCdiExtension(Artifact artifact) {
- return artifact.getGroupId().startsWith("org.jboss.seam.")
- && artifact.getVersion().startsWith("3.");
+ return (artifact.getGroupId().startsWith("org.jboss.seam.")
+ && artifact.getVersion().startsWith("3."))
+ || artifact.getGroupId().startsWith("org.apache.deltaspike.");
+
+
}
}
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-05-15 11:47:40 UTC (rev 41022)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/META-INF/MANIFEST.MF 2012-05-15 12:25:08 UTC (rev 41023)
@@ -17,6 +17,7 @@
org.jboss.tools.maven.jaxrs,
org.jboss.tools.maven.jbosspackaging,
org.jboss.tools.maven.jpa,
+ org.jboss.tools.maven.cdi,
org.jboss.tools.maven.ui,
org.eclipse.wst.server.core,
org.jboss.tools.common,
@@ -31,7 +32,8 @@
org.eclipse.m2e.tests.common;bundle-version="[1.0.0,1.2.0)",
org.eclipse.jpt.jpa.core;bundle-version="3.0.1",
org.eclipse.jpt.common.core,
- org.eclipse.jpt.common.utility
+ org.eclipse.jpt.common.utility,
+ org.jboss.tools.cdi.core
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Eclipse-RegisterBuddy: org.apache.log4j
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/cdi/deltaspike/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/cdi/deltaspike/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/cdi/deltaspike/pom.xml 2012-05-15 12:25:08 UTC (rev 41023)
@@ -0,0 +1,14 @@
+<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>foo.bar</groupId>
+ <artifactId>deltaspike</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.deltaspike.core</groupId>
+ <artifactId>deltaspike-core-api</artifactId>
+ <version>0.2-incubating</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/CDIConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/CDIConfiguratorTest.java (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/CDIConfiguratorTest.java 2012-05-15 12:25:08 UTC (rev 41023)
@@ -0,0 +1,48 @@
+/*************************************************************************************
+ * Copyright (c) 2012 Red Hat, Inc. and others.
+ * All rights reserved. This program and the accompanying materials
+ * are 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:
+ * JBoss by Red Hat - Initial implementation.
+ ************************************************************************************/
+package org.jboss.tools.maven.configurators.tests;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.cdi.core.CDICoreNature;
+import org.junit.Test;
+
+@SuppressWarnings("restriction")
+public class CDIConfiguratorTest extends AbstractMavenConfiguratorTest {
+
+ protected static final IProjectFacet MAVEN_FACET = ProjectFacetsManager.getProjectFacet("jboss.m2");
+ protected static final IProjectFacet CDI_FACET = ProjectFacetsManager.getProjectFacet("jst.cdi"); //$NON-NLS-1$
+ protected static final IProjectFacetVersion DEFAULT_CDI_VERSION = CDI_FACET.getVersion("1.0"); //$NON-NLS-1$
+
+ @Test
+ public void testJBIDE11741_deltaSpikeDependency() throws Exception {
+ String projectLocation = "projects/cdi/deltaspike";
+ IProject cdiProject = importProject(projectLocation+"/pom.xml");
+ waitForJobsToComplete();
+ assertNoErrors(cdiProject);
+ assertIsCDIProject(cdiProject, DEFAULT_CDI_VERSION);
+ }
+
+ private void assertIsCDIProject(IProject project, IProjectFacetVersion expectedCdiVersion) throws Exception {
+ assertNoErrors(project);
+ assertTrue("CDI nature is missing", project.hasNature(CDICoreNature.NATURE_ID));
+
+ IFacetedProject facetedProject = ProjectFacetsManager.create(project);
+ if (facetedProject != null) {
+ IProjectFacetVersion cdiVersion = facetedProject.getInstalledVersion(CDI_FACET);
+ assertEquals("Unexpected CDI Version", expectedCdiVersion, cdiVersion);
+ assertTrue("Maven Facet is missing", facetedProject.hasProjectFacet(MAVEN_FACET));
+ }
+ }
+}
13 years, 11 months
JBoss Tools SVN: r41022 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim.
by jbosstools-commits@lists.jboss.org
Author: yradtsevich
Date: 2012-05-15 07:47:40 -0400 (Tue, 15 May 2012)
New Revision: 41022
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/
Log:
BrowserSim - removed unnecessary dir
Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim
___________________________________________________________________
Modified: svn:ignore
- bin
target
+ bin
target
org.jboss.tools.vpe.browsersim
13 years, 11 months
JBoss Tools SVN: r41021 - workspace/mistria/install-tests/scripts.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 07:33:30 -0400 (Tue, 15 May 2012)
New Revision: 41021
Modified:
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Fix script
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 11:13:13 UTC (rev 41020)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 11:33:30 UTC (rev 41021)
@@ -30,13 +30,13 @@
echo "Preparing tests, installing framework"
+pushd $eclipse_home
iniFile=$(ls -1 *.ini)
productLineNumber=$(cat $iniFile | grep -n \\-product | cut -f 1 -d :)
let "productLineNumber = $productLineNumber + 1"
productName=$(sed -n ${productLineNumber}p $iniFile)
#install test framework
-pushd $eclipse_home
java -jar plugins/org.eclipse.equinox.launcher_*.jar \
-application org.eclipse.equinox.p2.director \
-repository http://download.eclipse.org/technology/swtbot/helios/dev-build/update-sit... \
13 years, 11 months
JBoss Tools SVN: r41020 - workspace/mistria/install-tests/scripts.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 07:13:13 -0400 (Tue, 15 May 2012)
New Revision: 41020
Modified:
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Fix for productName
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 11:04:32 UTC (rev 41019)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 11:13:13 UTC (rev 41020)
@@ -27,7 +27,14 @@
exit 3
fi
+
+
echo "Preparing tests, installing framework"
+iniFile=$(ls -1 *.ini)
+productLineNumber=$(cat $iniFile | grep -n \\-product | cut -f 1 -d :)
+let "productLineNumber = $productLineNumber + 1"
+productName=$(sed -n ${productLineNumber}p $iniFile)
+
#install test framework
pushd $eclipse_home
java -jar plugins/org.eclipse.equinox.launcher_*.jar \
@@ -46,7 +53,7 @@
-jar plugins/org.eclipse.equinox.launcher_*.jar \
-application org.eclipse.swtbot.eclipse.junit4.headless.swtbottestapplication \
-testApplication org.eclipse.ui.ide.workbench \
- -product org.eclipse.sdk.ide \
+ -product $productName \
-data workspace/ \
formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,$report \
formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter \
13 years, 11 months
JBoss Tools SVN: r41018 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-05-15 06:04:16 -0400 (Tue, 15 May 2012)
New Revision: 41018
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
Log:
JBIDE-11822 - Found SOA-P runtime does not show version
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2012-05-15 10:00:18 UTC (rev 41017)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/JBossServerType.java 2012-05-15 10:04:16 UTC (rev 41018)
@@ -391,7 +391,7 @@
}
public String getFullVersion(File location, File systemFile) {
- String fullVersion = ServerBeanLoader.getFullServerVersionFromZip(location);
+ String fullVersion = ServerBeanLoader.getFullServerVersionFromZip(systemFile);
if (fullVersion != null && fullVersion.startsWith("5.1.1")) { //$NON-NLS-1$
// SOA-P 5.2
String runJar = JBossServerType.JBOSS_AS_PATH + File.separatorChar +
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2012-05-15 10:00:18 UTC (rev 41017)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/bean/ServerBeanLoader.java 2012-05-15 10:04:16 UTC (rev 41018)
@@ -111,6 +111,9 @@
return version;
}
version = (String)props.get("Specification-Version");//$NON-NLS-1$
+ if (version == null || version.trim().length() == 0 || !(version.charAt(0) >= '0' && version.charAt(0) <= '9')) {
+ version = (String)props.get("Implementation-Version");//$NON-NLS-1$
+ }
} catch (IOException e) {
// It's already null, and would fall through to return null,
// but hudson doesn't like empty catch blocks.
13 years, 11 months
JBoss Tools SVN: r41017 - workspace/mistria/install-tests/scripts.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 06:00:18 -0400 (Tue, 15 May 2012)
New Revision: 41017
Modified:
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Fix script
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 09:04:27 UTC (rev 41016)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 10:00:18 UTC (rev 41017)
@@ -20,8 +20,8 @@
exit 2
fi
-echo "$(dirname $0)"
-if [ ! -d "$(dirname $0)/repository" ]; then
+repo="$(dirname $0)/repository"
+if [ ! -d "$repo" ]; then
echo "Missing companion repository"
echo "Cannot perform tests"
exit 3
@@ -32,7 +32,7 @@
pushd $eclipse_home
java -jar plugins/org.eclipse.equinox.launcher_*.jar \
-application org.eclipse.equinox.p2.director \
- -repository http://download.eclipse.org/technology/swtbot/helios/dev-build/update-sit... \
+ -repository http://download.eclipse.org/technology/swtbot/helios/dev-build/update-sit... \
-installIU org.jboss.tools.qa.install.tests.feature.feature.group \
-consoleLog
13 years, 11 months
JBoss Tools SVN: r41016 - in workspace/mistria/install-tests/scripts: scenarios and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 05:04:27 -0400 (Tue, 15 May 2012)
New Revision: 41016
Added:
workspace/mistria/install-tests/scripts/scenarios/
workspace/mistria/install-tests/scripts/scenarios/update_ko
workspace/mistria/install-tests/scripts/scenarios/update_ok
Removed:
workspace/mistria/install-tests/scripts/sites
Modified:
workspace/mistria/install-tests/scripts/assembly.xml
Log:
clean
Modified: workspace/mistria/install-tests/scripts/assembly.xml
===================================================================
--- workspace/mistria/install-tests/scripts/assembly.xml 2012-05-15 08:56:48 UTC (rev 41015)
+++ workspace/mistria/install-tests/scripts/assembly.xml 2012-05-15 09:04:27 UTC (rev 41016)
@@ -14,6 +14,14 @@
</includes>
<fileMode>777</fileMode>
</fileSet>
+ <fileSet>
+ <directory>${project.basedir}/scenarios</directory>
+ <outputDirectory>scenarios</outputDirectory>
+ <includes>
+ <include>*</include>
+ </includes>
+ <fileMode>777</fileMode>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Added: workspace/mistria/install-tests/scripts/scenarios/update_ko
===================================================================
--- workspace/mistria/install-tests/scripts/scenarios/update_ko (rev 0)
+++ workspace/mistria/install-tests/scripts/scenarios/update_ko 2012-05-15 09:04:27 UTC (rev 41016)
@@ -0,0 +1,2 @@
+http://download.jboss.org/jbosstools/updates/nightly/core/trunk/
+http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/
Copied: workspace/mistria/install-tests/scripts/scenarios/update_ok (from rev 40981, workspace/mistria/install-tests/scripts/sites)
===================================================================
--- workspace/mistria/install-tests/scripts/scenarios/update_ok (rev 0)
+++ workspace/mistria/install-tests/scripts/scenarios/update_ok 2012-05-15 09:04:27 UTC (rev 41016)
@@ -0,0 +1,2 @@
+http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/
+http://download.jboss.org/jbosstools/updates/nightly/core/trunk/
Deleted: workspace/mistria/install-tests/scripts/sites
===================================================================
--- workspace/mistria/install-tests/scripts/sites 2012-05-15 08:56:48 UTC (rev 41015)
+++ workspace/mistria/install-tests/scripts/sites 2012-05-15 09:04:27 UTC (rev 41016)
@@ -1,2 +0,0 @@
-http://download.jboss.org/jbosstools/updates/JBossTools-3.3.0.Beta2.core/
-http://download.jboss.org/jbosstools/updates/nightly/core/trunk/
13 years, 11 months
JBoss Tools SVN: r41015 - trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs.
by jbosstools-commits@lists.jboss.org
Author: snjeza
Date: 2012-05-15 04:56:48 -0400 (Tue, 15 May 2012)
New Revision: 41015
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
Log:
JBIDE-11829 - Different result of Seam runtime detection based on JBoss AS detector presence
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-05-15 08:48:38 UTC (rev 41014)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.ui/src/org/jboss/tools/runtime/ui/dialogs/SearchRuntimePathDialog.java 2012-05-15 08:56:48 UTC (rev 41015)
@@ -337,28 +337,51 @@
} else {
serverDefinitions.clear();
}
+ List<RuntimeDefinition> allDefinitions = getAllDefinitions();
for (RuntimePath runtimePath : runtimePaths) {
- for (RuntimeDefinition serverDefinition : runtimePath
- .getServerDefinitions()) {
+ List<RuntimeDefinition> pathDefinitions = getAllDefinitions(runtimePath);
+ for (RuntimeDefinition serverDefinition : pathDefinitions) {
if (!RuntimeUIActivator.runtimeCreated(serverDefinition)) {
- List<RuntimeDefinition> allServerDefinitions = RuntimeUIActivator.getDefault().getServerDefinitions();
+
String name = serverDefinition.getName();
int i = 2;
- while (serverDefinitionsExists(serverDefinition, allServerDefinitions)) {
+ while (serverDefinitionsExists(serverDefinition, allDefinitions)) {
serverDefinition.setName(name + " (" + i++ + ")");
}
}
+ }
+
+ }
+ for (RuntimePath runtimePath : runtimePaths) {
+ for (RuntimeDefinition serverDefinition : runtimePath.getServerDefinitions()) {
if (!hideCreatedRuntimes) {
serverDefinitions.add(serverDefinition);
} else if (!RuntimeUIActivator.runtimeCreated(serverDefinition)) {
serverDefinitions.add(serverDefinition);
}
}
-
}
return serverDefinitions;
}
+ protected List<RuntimeDefinition> getAllDefinitions(RuntimePath runtimePath) {
+ List<RuntimeDefinition> allDefinitions = new ArrayList<RuntimeDefinition>();
+ allDefinitions.addAll(runtimePath.getServerDefinitions());
+ for (RuntimeDefinition serverDefinition : runtimePath.getServerDefinitions()) {
+ allDefinitions.addAll(serverDefinition.getIncludedServerDefinitions());
+ }
+ return allDefinitions;
+ }
+
+ private List<RuntimeDefinition> getAllDefinitions() {
+ List<RuntimeDefinition> allServerDefinitions = new ArrayList<RuntimeDefinition>();
+ allServerDefinitions.addAll(RuntimeUIActivator.getDefault().getServerDefinitions());
+ for (RuntimeDefinition d:RuntimeUIActivator.getDefault().getServerDefinitions()) {
+ allServerDefinitions.addAll(d.getIncludedServerDefinitions());
+ }
+ return allServerDefinitions;
+ }
+
private boolean serverDefinitionsExists(RuntimeDefinition serverDefinition,
List<RuntimeDefinition> allServerDefinitions) {
String name = serverDefinition.getName();
13 years, 11 months
JBoss Tools SVN: r41014 - in workspace/mistria/install-tests: scripts and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: mickael_istria
Date: 2012-05-15 04:48:38 -0400 (Tue, 15 May 2012)
New Revision: 41014
Modified:
workspace/mistria/install-tests/pom.xml
workspace/mistria/install-tests/scripts/testInstall.sh
Log:
Fix tycho version + typo in script
Modified: workspace/mistria/install-tests/pom.xml
===================================================================
--- workspace/mistria/install-tests/pom.xml 2012-05-15 03:15:41 UTC (rev 41013)
+++ workspace/mistria/install-tests/pom.xml 2012-05-15 08:48:38 UTC (rev 41014)
@@ -24,7 +24,7 @@
<properties>
- <tychoVersion>0.15.0-SNAPSHOT</tychoVersion>
+ <tychoVersion>0.14.1</tychoVersion>
<tychoExtrasVersion>0.14.0</tychoExtrasVersion>
</properties>
Modified: workspace/mistria/install-tests/scripts/testInstall.sh
===================================================================
--- workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 03:15:41 UTC (rev 41013)
+++ workspace/mistria/install-tests/scripts/testInstall.sh 2012-05-15 08:48:38 UTC (rev 41014)
@@ -8,7 +8,7 @@
echo "usage: <dir>/testInstalls.sh <eclipse_home> <file_containing_list_of_sites>"
echo " <eclipse_home>: an eclipse installation will be performed on"
echo " <file_containing_list_of_sites> a file containing a list of p2-friendly URLs of repositories"
- echo " separated by spaces or line breaks
+ echo " separated by spaces or line breaks"
}
if [ ! -d "$eclipse_home" -o ! -f "$eclipse_home/eclipse" ]; then
@@ -60,4 +60,4 @@
fi
done
popd
-exit 0
\ No newline at end of file
+exit 0
13 years, 11 months