Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

IDE-784

  • Loading branch information...
commit 7de8e3488526d637c8756f54272f2a3934d69d03 1 parent ad66f65
@gamerson gamerson authored
View
1  build/releng/com.liferay.ide-repository/composite/compositeArtifacts.xml
@@ -8,6 +8,5 @@
<children size='3'>
<child location='tools/' />
<child location='maven/' />
- <child location='velocity/' />
</children>
</repository>
View
1  build/releng/com.liferay.ide-repository/composite/compositeContent.xml
@@ -8,6 +8,5 @@
<children size='3'>
<child location='tools/' />
<child location='maven/' />
- <child location='velocity/' />
</children>
</repository>
View
47 build/releng/com.liferay.ide-repository/hidden.features.product
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Liferay IDE Tools Hidden Features" uid="com.liferay.ide-repository.hidden.features" id="com.liferay.ide-repository.hidden.features" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="false">
+
+ <aboutInfo>
+ </aboutInfo>
+
+ <configIni>
+ </configIni>
+
+ <launcherArgs>
+ </launcherArgs>
+
+ <windowImages>
+ </windowImages>
+
+ <splash>
+ </splash>
+ <launcher>
+ </launcher>
+
+ <vm>
+ </vm>
+
+ <license>
+ </license>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.sapphire" />
+ <feature id="org.eclipse.sapphire.java" />
+ <feature id="org.eclipse.sapphire.java.jdt" />
+ <feature id="org.eclipse.sapphire.modeling.xml" />
+ <feature id="org.eclipse.sapphire.osgi" />
+ <feature id="org.eclipse.sapphire.platform" />
+ <feature id="org.eclipse.sapphire.ui" />
+ <feature id="org.eclipse.sapphire.ui.swt.gef" />
+ <feature id="org.eclipse.sapphire.ui.swt.xml.editor" />
+ </features>
+
+ <configurations>
+ </configurations>
+
+</product>
View
56 build/releng/com.liferay.ide-repository/src/main/assembly/CreateCompositeSite.groovy
@@ -3,7 +3,7 @@ def repositoryDir = basedir + "/target/repository"
def contentJar = repositoryDir + "/content.jar"
def contentDir = basedir + "/target/content.jar/"
-// Add associate sites
+// Remove hidden feature
println 'Unzipping content.jar'
@@ -20,11 +20,31 @@ def parser = new XmlParser()
parser.setTrimWhitespace( false )
def root = parser.parseText( contentXmlText )
+def hiddenCategory = root.units.unit.findAll{ it.'@id'.equals('com.liferay.ide-repository.hidden.features') }.get( 0 )
+hiddenCategory.parent().remove( hiddenCategory )
+
+/*
+def addAssociateSite( root, siteUrl )
+{
+ def refs = root.references
+
+ if( !refs || refs.size() == 0 )
+ {
+ def newRefs = new Node( root, 'references' )
+ newRefs.@size = "2"
+ refs = root.references
+ }
+
+ new Node( refs.get( 0 ), 'repository', [ uri:siteUrl, url:siteUrl, type:'1', options:'1'] )
+ new Node( refs.get( 0 ), 'repository', [ uri:siteUrl, url:siteUrl, type:'0', options:'1'] )
+}
+
+
def props = root.properties
def sapphireSite = project.properties.getProperty("sapphire-site")
addAssociateSite( root, sapphireSite )
-
+*/
class MyXmlNodePrinter extends XmlNodePrinter
{
@@ -52,27 +72,12 @@ contentXml.text = result
println 'Zipping back customized content.jar'
ant.zip( destFile: contentJar, baseDir:contentDir )
-def addAssociateSite( root, siteUrl )
-{
- def refs = root.references
-
- if( !refs || refs.size() == 0 )
- {
- def newRefs = new Node( root, 'references' )
- newRefs.@size = "2"
- refs = root.references
- }
-
- new Node( refs.get( 0 ), 'repository', [ uri:siteUrl, url:siteUrl, type:'1', options:'1'] )
- new Node( refs.get( 0 ), 'repository', [ uri:siteUrl, url:siteUrl, type:'0', options:'1'] )
-}
-
// Create composite repository
def compositeDir = new File( basedir, "target/composite" )
def toolsRepository = new File( basedir, "target/repository" )
def mavenRepository = new File( basedir, "../com.liferay.ide.maven-repository/target/repository" )
-def velocityRepository = new File( basedir, "../com.liferay.ide.velocity-repository/target/repository" )
+//def velocityRepository = new File( basedir, "../com.liferay.ide.velocity-repository/target/repository" )
compositeDir.delete()
compositeDir.mkdirs()
@@ -106,13 +111,13 @@ ant.sequential
}
}
- copy( todir:"${compositeDir}/velocity" )
- {
- fileset( dir:velocityRepository )
- {
- include( name:"**/*" )
- }
- }
+ //copy( todir:"${compositeDir}/velocity" )
+ //{
+ // fileset( dir:velocityRepository )
+ // {
+ // include( name:"**/*" )
+ // }
+ //}
}
def unqualifiedVersion = project.properties.getProperty("unqualifiedVersion")
@@ -121,4 +126,3 @@ def buildQualifier = project.properties.getProperty("buildQualifier")
println 'Zipping updated site'
File zipSite = new File( basedir + "/target/Liferay_IDE_${unqualifiedVersion}.${buildQualifier}-updatesite.zip" )
ant.zip( destFile: zipSite, baseDir:compositeDir )
-
View
2  build/releng/com.liferay.ide.maven-repository/category.xml
@@ -8,6 +8,8 @@
<category name="lide-maven" />
</feature>
+ <bundle id="org.slf4j.api" version="0.0.0"/>
+
<category-def name="lide-maven" label="Liferay IDE Maven">
<description>
Liferay IDE Maven.
View
42 build/releng/com.liferay.ide.maven-repository/hidden.features.product
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Liferay IDE Maven Hidden Features" uid="com.liferay.ide.maven-repository.hidden.features" id="com.liferay.ide.maven-repository.hidden.features" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="false">
+
+ <aboutInfo>
+ </aboutInfo>
+
+ <configIni>
+ </configIni>
+
+ <launcherArgs>
+ </launcherArgs>
+
+ <windowImages>
+ </windowImages>
+
+ <splash>
+ </splash>
+ <launcher>
+ </launcher>
+
+ <vm>
+ </vm>
+
+ <license>
+ </license>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.m2e.feature" />
+ <feature id="org.eclipse.m2e.wtp.feature" />
+ <feature id="org.eclipse.m2e.wtp.jsf.feature" />
+ <feature id="org.sonatype.m2e.mavenarchiver.feature" />
+ </features>
+
+ <configurations>
+ </configurations>
+
+</product>
View
4 build/releng/com.liferay.ide.maven-repository/pom.xml
@@ -34,7 +34,7 @@
<version>1.4</version>
<executions>
<execution>
- <id>add-associate-sites</id>
+ <id>remove-unwanted-units</id>
<phase>package</phase>
<goals>
<goal>execute</goal>
@@ -42,7 +42,7 @@
</execution>
</executions>
<configuration>
- <source>${pom.basedir}/src/main/assembly/AddAssociateSites.groovy</source>
+ <source>${pom.basedir}/src/main/assembly/RemoveUnwantedUnits.groovy</source>
</configuration>
</plugin>
</plugins>
View
42 ...sitory/src/main/assembly/AddAssociateSites.groovy → ...tory/src/main/assembly/RemoveUnwantedUnits.groovy
@@ -1,19 +1,3 @@
-def addAssociateSite( root, siteUrl )
-{
- def refs = root.references
-
- if( !refs || refs.size() == 0 )
- {
- def newRefs = new Node( root, 'references' )
- newRefs.@size = "4"
- refs = root.references
- }
-
- new Node( refs.get( 0 ), 'repository', [ uri:siteUrl, url:siteUrl, type:'1', options:'1'] )
- new Node( refs.get( 0 ), 'repository', [ uri:siteUrl, url:siteUrl, type:'0', options:'1'] )
-}
-
-
def basedir = project.basedir.canonicalPath
def repositoryDir = basedir + "/target/repository"
def contentJar = repositoryDir + "/content.jar"
@@ -26,32 +10,18 @@ def ant = new AntBuilder(); // create an antbuilder
ant.unzip( src: contentJar, dest:contentDir, overwrite:"true" )
-println 'Modify content.xml to add associate sites for Liferay IDE'
+println 'Modify content.xml to remove default category'
File contentXml = new File( contentDir, "content.xml" )
def parser = new XmlParser()
parser.setTrimWhitespace( false )
def root = parser.parseText( contentXml.text )
-def m2eSite = project.properties.getProperty("m2e-site")
-def m2eWtpSite = project.properties.getProperty("m2e-wtp-site")
-
-addAssociateSite( root, m2eSite )
-addAssociateSite( root, m2eWtpSite )
-
-class MyXmlNodePrinter extends XmlNodePrinter
-{
- MyXmlNodePrinter(PrintWriter out)
- {
- super(out)
- }
-
- void printSimpleItem(Object value)
- {
- value = value.replaceAll("\n", "&#xA;")
- out.print(value)
- }
-}
+def defaultCategory = root.units.unit.findAll{ it.'@id'.endsWith('.Default') }.get( 0 )
+defaultCategory.parent().remove( defaultCategory )
+
+def hiddenCategory = root.units.unit.findAll{ it.'@id'.equals('com.liferay.ide.maven-repository.hidden.features') }.get( 0 )
+hiddenCategory.parent().remove( hiddenCategory )
println 'Overwriting content.xml'
def writer = new StringWriter()
View
7 common/features/com.liferay.ide.common-feature/feature.xml
@@ -38,13 +38,6 @@
unpack="false"/>
<plugin
- id="com.liferay.ide.freemarker"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="com.liferay.ide.ui"
download-size="0"
install-size="0"
View
12 maven/features/com.liferay.ide.maven-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.liferay.ide.maven"
- label="Liferay IDE Maven"
+ label="Liferay IDE Maven Integration"
version="2.0.0.qualifier"
provider-name="Liferay, Inc.">
@@ -31,11 +31,11 @@
</license>
<requires>
- <import feature="org.eclipse.m2e.wtp.feature" version="0.17.0" match="greaterOrEqual" />
- <import feature="org.eclipse.m2e.wtp.jsf.feature" version="0.17.0" match="greaterOrEqual" />
- <import feature="org.eclipse.m2e.feature" version="1.3.0" match="greaterOrEqual" />
- <import feature="com.liferay.ide.common" version="2.0.0" match="greaterOrEqual" />
- <import feature="com.liferay.ide.eclipse.tools" version="2.0.0" match="greaterOrEqual" />
+ <import feature="org.eclipse.m2e.wtp.feature" version="0.17.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.m2e.wtp.jsf.feature" version="0.17.0" match="greaterOrEqual"/>
+ <import feature="org.eclipse.m2e.feature" version="1.3.0" match="greaterOrEqual"/>
+ <import feature="com.liferay.ide.common" version="2.0.0" match="greaterOrEqual"/>
+ <import feature="com.liferay.ide.eclipse.tools" version="2.0.0" match="greaterOrEqual"/>
</requires>
<plugin
View
2  maven/features/com.liferay.ide.maven-feature/pom.xml
@@ -28,6 +28,6 @@
<artifactId>com.liferay.ide.maven</artifactId>
<packaging>eclipse-feature</packaging>
- <name>Liferay IDE Maven Support Feature</name>
+ <name>Liferay IDE Maven Integration Feature</name>
</project>
Please sign in to comment.
Something went wrong with that request. Please try again.