Author: akazakov Date: 2008-11-24 12:51:11 -0500 (Mon, 24 Nov 2008) New Revision: 11991 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java Log: https://jira.jboss.org/jira/browse/JBIDE-3266 Fixed Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-24 17:26:31 UTC (rev 11990) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-24 17:51:11 UTC (rev 11991) @@ -391,9 +391,9 @@ seamGenResFolder, webContentFolder, new AntCopyUtils.FileSetFileFilter(webInfSet), viewFilterSetCollection, false); final FilterSetCollection hibernateDialectFilterSet = new FilterSetCollection(); - hibernateDialectFilterSet.addFilterSet(jdbcFilterSet); - hibernateDialectFilterSet.addFilterSet(projectFilterSet); - hibernateDialectFilterSet.addFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model)); + hibernateDialectFilterSet.addFilterSet(encodedJdbcFilterSet); + hibernateDialectFilterSet.addFilterSet(encodedProjectFilterSet); + hibernateDialectFilterSet.addFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model, true)); final IContainer source = warSrcRootFolder.getUnderlyingFolder(); @@ -584,9 +584,9 @@ FilterSet projectFilterSet = SeamFacetFilterSetFactory.createProjectFilterSet(model); FilterSetCollection hibernateDialectFilterSet = new FilterSetCollection(); - hibernateDialectFilterSet.addFilterSet(jdbcFilterSet); - hibernateDialectFilterSet.addFilterSet(projectFilterSet); - hibernateDialectFilterSet.addFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model)); + hibernateDialectFilterSet.addFilterSet(encodedJdbcFilterSet); + hibernateDialectFilterSet.addFilterSet(encodedProjectFilterSet); + hibernateDialectFilterSet.addFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model, true)); IResource src = getSrcFolder(project); if(src!=null) { @@ -644,7 +644,9 @@ protected FilterSet ejbFilterSet; protected FilterSetCollection viewFilterSetCollection; protected FilterSet jdbcFilterSet; + protected FilterSet encodedJdbcFilterSet; protected FilterSet projectFilterSet; + protected FilterSet encodedProjectFilterSet; protected FilterSet filtersFilterSet; /** @@ -677,7 +679,9 @@ } jdbcFilterSet = SeamFacetFilterSetFactory.createJdbcFilterSet(model); - projectFilterSet = SeamFacetFilterSetFactory.createProjectFilterSet(model); + encodedJdbcFilterSet = SeamFacetFilterSetFactory.createJdbcFilterSet(model, true); + projectFilterSet = SeamFacetFilterSetFactory.createProjectFilterSet(model); + encodedProjectFilterSet = SeamFacetFilterSetFactory.createProjectFilterSet(model, true); filtersFilterSet = SeamFacetFilterSetFactory.createFiltersFilterSet(model); // **************************************************************** Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java 2008-11-24 17:26:31 UTC (rev 11990) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java 2008-11-24 17:51:11 UTC (rev 11991) @@ -60,37 +60,60 @@ FILTERS_TEMPLATE.addFilter("homeName","${component.name}Home"); //$NON-NLS-1$ //$NON-NLS-2$ FILTERS_TEMPLATE.addFilter("query","${query.text}"); //$NON-NLS-1$ //$NON-NLS-2$ - HIBERNATE_DIALECT_TEMPLATE = new FilterSet(); HIBERNATE_DIALECT_TEMPLATE.addFilter("hibernate.dialect","${hibernate.dialect}"); //$NON-NLS-1$ //$NON-NLS-2$ } - + + public static FilterSet createJdbcFilterSet(IDataModel values, boolean encodeValuesForPropertyFiles) { + return applyProperties((FilterSet)JDBC_TEMPLATE.clone(), values, encodeValuesForPropertyFiles); + } + + public static FilterSet createProjectFilterSet(IDataModel values, boolean encodeValuesForPropertyFiles){ + return applyProperties((FilterSet)PROJECT_TEMPLATE.clone(), values, encodeValuesForPropertyFiles); + } + + public static FilterSet createFiltersFilterSet(IDataModel values, boolean encodeValuesForPropertyFiles) { + return applyProperties((FilterSet)FILTERS_TEMPLATE.clone(), values, encodeValuesForPropertyFiles); + } + + public static FilterSet createHibernateDialectFilterSet(IDataModel values, boolean encodeValuesForPropertyFiles) { + return applyProperties((FilterSet)HIBERNATE_DIALECT_TEMPLATE.clone(), values, encodeValuesForPropertyFiles); + } + + public static FilterSet createFiltersFilterSet(Map values, boolean encodeValuesForPropertyFiles) { + return applyProperties((FilterSet)FILTERS_TEMPLATE.clone(), values, false); + } + public static FilterSet createJdbcFilterSet(IDataModel values) { - return applyProperties((FilterSet)JDBC_TEMPLATE.clone(), values); + return createJdbcFilterSet(values, false); } + public static FilterSet createProjectFilterSet(IDataModel values){ - return applyProperties((FilterSet)PROJECT_TEMPLATE.clone(), values); + return createProjectFilterSet(values, false); } - + public static FilterSet createFiltersFilterSet(IDataModel values) { - return applyProperties((FilterSet)FILTERS_TEMPLATE.clone(), values); + return createFiltersFilterSet(values, false); } - + public static FilterSet createHibernateDialectFilterSet(IDataModel values) { - return applyProperties((FilterSet)HIBERNATE_DIALECT_TEMPLATE.clone(), values); + return createHibernateDialectFilterSet(values, false); } - + public static FilterSet createFiltersFilterSet(Map values) { - return applyProperties((FilterSet)FILTERS_TEMPLATE.clone(), values); + return createFiltersFilterSet(values, false); } - - private static FilterSet applyProperties(FilterSet template,IDataModel values) { + + private static FilterSet applyProperties(FilterSet template, IDataModel values, boolean encodeValuesForPropertyFiles) { FilterSet result = new FilterSet(); for (Object filter : template.getFilterHash().keySet()) { String value = template.getFilterHash().get(filter).toString(); for (Object property : values.getAllProperties()) { if(value.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$ Object propertyValue = values.getProperty(property.toString()); + if(encodeValuesForPropertyFiles && propertyValue!=null) { + propertyValue = propertyValue.toString().replace("\\", "\\\\"); + } value = value.replace("${"+property.toString()+"}",propertyValue==null?"":propertyValue.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } @@ -98,14 +121,17 @@ } return result; } - - private static FilterSet applyProperties(FilterSet template,Map values) { + + private static FilterSet applyProperties(FilterSet template, Map values, boolean encodeValuesForPropertyFiles) { FilterSet result = new FilterSet(); for (Object filter : template.getFilterHash().keySet()) { String value = template.getFilterHash().get(filter).toString(); for (Object property : values.keySet()){ if(value.contains("${"+property.toString()+"}")) { //$NON-NLS-1$ //$NON-NLS-2$ Object propertyValue = values.get(property.toString()); + if(encodeValuesForPropertyFiles && propertyValue!=null) { + propertyValue = propertyValue.toString().replace("\\", "\\\\"); + } value = value.replace("${"+property.toString()+"}",propertyValue==null?"":propertyValue.toString()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2008-11-24 17:26:31 UTC (rev 11990) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2008-11-24 17:51:11 UTC (rev 11991) @@ -90,7 +90,9 @@ protected File hibernateConsolePropsFile; protected FilterSet jdbcFilterSet; + protected FilterSet encodedJdbcFilterSet; protected FilterSet projectFilterSet; + protected FilterSet encodedProjectFilterSet; protected FilterSetCollection viewFilterSetCollection; protected FilterSetCollection hibernateDialectFilterSet; protected File dataSourceDsFile; @@ -144,16 +146,18 @@ ejbMetaInf = new File(ejbProjectFolder, "ejbModule/META-INF"); //$NON-NLS-1$ jdbcFilterSet = SeamFacetFilterSetFactory.createJdbcFilterSet(model); + encodedJdbcFilterSet = SeamFacetFilterSetFactory.createJdbcFilterSet(model, true); projectFilterSet = SeamFacetFilterSetFactory.createProjectFilterSet(model); + encodedProjectFilterSet = SeamFacetFilterSetFactory.createProjectFilterSet(model, true); viewFilterSetCollection = new FilterSetCollection(); viewFilterSetCollection.addFilterSet(jdbcFilterSet); viewFilterSetCollection.addFilterSet(projectFilterSet); hibernateDialectFilterSet = new FilterSetCollection(); - hibernateDialectFilterSet.addFilterSet(jdbcFilterSet); - hibernateDialectFilterSet.addFilterSet(projectFilterSet); - hibernateDialectFilterSet.addFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model)); + hibernateDialectFilterSet.addFilterSet(encodedJdbcFilterSet); + hibernateDialectFilterSet.addFilterSet(encodedProjectFilterSet); + hibernateDialectFilterSet.addFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model, true)); try { ejbTemplateDir = new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb");