Permalink
Browse files

Removed adding Theme CSS Builder for maven projects

  • Loading branch information...
1 parent 1ba266d commit d30b8088b01ace362d8185c2917bfb8ef9dd6d04 @gamerson gamerson committed Feb 26, 2013
@@ -111,6 +111,9 @@ private MavenProblemInfo checkValidLiferayVersion( Plugin liferayMavenPlugin, Xp
{
liferayVersionValue = liferayVersionNode.getValue();
+ // handle the case where user specifies SNAPSHOT version
+ liferayVersionValue = liferayVersionValue.replaceAll( "-SNAPSHOT$", "" ); //$NON-NLS-1$ //$NON-NLS-2$
+
try
{
liferayVersion = new Version( liferayVersionValue );
@@ -30,6 +30,10 @@ public Object getDefaultProperty( String propertyName )
{
return false;
}
+ else if ( INSTALL_THEME_CSS_BUILDER.equals( propertyName) )
+ {
+ return false;
+ }
else if( SETUP_DEFAULT_OUTPUT_LOCATION.equals( propertyName ) )
{
return false;
@@ -26,7 +26,7 @@
extends IJ2EEFacetProjectCreationDataModelProperties, IProjectCreationPropertiesNew
{
- public static final String CONFIGURE_DEPLOYMENT_ASSEMBLY =
+ public static final String CONFIGURE_DEPLOYMENT_ASSEMBLY =
"IPluginProjectDataModelProperties.CONFIGURE_DEPLOYMENT_ASSEMBLY"; //$NON-NLS-1$
public static final String CREATE_PROJECT_OPERATION = "IPluginProjectDataModelProperties.CREATE_PROJECT_OPERATION"; //$NON-NLS-1$
@@ -40,6 +40,9 @@
public static final String INSTALL_LIFERAY_PLUGIN_LIBRARY_DELEGATE =
"IPluginProjectDataModelProperties.INSTALL_LIFERAY_PLUGIN_LIBRARY_DELEGATE"; //$NON-NLS-1$
+ public static final String INSTALL_THEME_CSS_BUILDER =
+ "IPluginProjectDataModelProperties.INSTALL_THEME_CSS_BUILDER"; //$NON-NLS-1$
+
public static final String LAYOUTTPL_NAME = "IPluginProjectDataModelProperties.LAYOUTTPL_NAME"; //$NON-NLS-1$
public static final String LIFERAY_PLUGIN_LIBRARY_DELEGATE =
@@ -83,6 +83,7 @@ public Set getPropertyNames()
propNames.add( CONFIGURE_DEPLOYMENT_ASSEMBLY );
propNames.add( INSTALL_LIFERAY_PLUGIN_LIBRARY_DELEGATE );
+ propNames.add( INSTALL_THEME_CSS_BUILDER );
propNames.add( LIFERAY_PLUGIN_LIBRARY_DELEGATE );
propNames.add( LIFERAY_SDK_NAME );
propNames.add( SETUP_DEFAULT_OUTPUT_LOCATION );
@@ -106,7 +106,10 @@ else if( shouldSetupDefaultOutputLocation() )
}
}
- installThemeBuilder( this.project );
+ if( shouldInstallThemeBuilder() )
+ {
+ installThemeBuilder( this.project );
+ }
try
{
@@ -207,4 +210,9 @@ protected boolean shouldInstallPluginLibraryDelegate()
return false;
}
+ protected boolean shouldInstallThemeBuilder()
+ {
+ return this.model.getBooleanProperty( INSTALL_THEME_CSS_BUILDER );
+ }
+
}
@@ -25,6 +25,17 @@
{
@Override
+ public Object getDefaultProperty( String propertyName )
+ {
+ if( INSTALL_THEME_CSS_BUILDER.equals( propertyName) )
+ {
+ return true;
+ }
+
+ return super.getDefaultProperty( propertyName );
+ }
+
+ @Override
protected String getPluginFacetId()
{
return IPluginFacetConstants.LIFERAY_THEME_FACET_ID;

0 comments on commit d30b808

Please sign in to comment.