Author: rob.stryker(a)jboss.com Date: 2012-01-09 02:45:20 -0500 (Mon, 09 Jan 2012) New Revision: 37712 Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/TODO Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java Log: JBDS-1974 - changing jboss_config to jboss_config_dir, which accounts for more usecases Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/TODO =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/TODO (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/TODO 2012-01-09 07:45:20 UTC (rev 37712) @@ -0,0 +1 @@ +# NEW_SERVER_ADAPTER Add the default port xpaths in it's own file in this folder \ No newline at end of file Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 2012-01-09 04:17:56 UTC (rev 37711) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.32 2012-01-09 07:45:20 UTC (rev 37712) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 2012-01-09 04:17:56 UTC (rev 37711) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.40 2012-01-09 07:45:20 UTC (rev 37712) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 2012-01-09 04:17:56 UTC (rev 37711) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.42 2012-01-09 07:45:20 UTC (rev 37712) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 2012-01-09 04:17:56 UTC (rev 37711) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.50 2012-01-09 07:45:20 UTC (rev 37712) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 2012-01-09 04:17:56 UTC (rev 37711) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.51 2012-01-09 07:45:20 UTC (rev 37712) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 2012-01-09 04:17:56 UTC (rev 37711) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.43 2012-01-09 07:45:20 UTC (rev 37712) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 2012-01-09 04:17:56 UTC (rev 37711) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/filesetdata/org.jboss.ide.eclipse.as.eap.50 2012-01-09 07:45:20 UTC (rev 37712) @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="UTF-8"?> <filesets> -<fileset excludes="" folder="server/${jboss_config}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> +<fileset excludes="" folder="${jboss_config_dir}/conf" includes="jboss-log4j.xml" name="Log4j.xml"/> </filesets> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-01-09 04:17:56 UTC (rev 37711) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-01-09 07:45:20 UTC (rev 37712) @@ -97,7 +97,7 @@ LocalJBossServerRuntime ajbsr = (LocalJBossServerRuntime) server2.getRuntime().loadAdapter(LocalJBossServerRuntime.class, null); if(ajbsr != null ) { - String configFolder = "server/${jboss_config}"; //ajbsr.getConfigurationFullPath(); //$NON-NLS-1$ + String configFolder = "${jboss_config_dir}"; //ajbsr.getConfigurationFullPath(); //$NON-NLS-1$ if( configFolder != null ) { ArrayList<XPathCategory> defaults = loadDefaults(server2, configFolder); serverToCategories.put(server2.getId(), defaults);