Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Version 0.5.2 - Add additional search call to look for properties fil…

…es within jars they are enclosed in + Add some better debug logging for why the actual analysis is run
  • Loading branch information...
commit ebf36c51ee5fa88adc7dce8561c4837c2e55fdf5 1 parent 5e9a496
@rbackhouse rbackhouse authored
View
2  org.dojotoolkit.compressor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Compressor
Bundle-SymbolicName: org.dojotoolkit.compressor
-Bundle-Version: 0.4.9
+Bundle-Version: 0.5.2
Import-Package: org.dojotoolkit.server.util.resource,
org.osgi.framework;version="1.3.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
View
BIN  org.dojotoolkit.compressor/org/dojotoolkit/compressor/JSCompressorFactoryImpl.class
Binary file not shown
View
3  org.dojotoolkit.compressor/src/org/dojotoolkit/compressor/JSCompressorFactoryImpl.java
@@ -34,6 +34,9 @@ public JSCompressorFactoryImpl() {
try {
Class<JSCompressor> jsCompressorClass = null;
URL propsURL = getClass().getClassLoader().getResource("/org_dojotoolkit_compressor.properties");
+ if (propsURL == null) {
+ propsURL = getClass().getResource("/org_dojotoolkit_compressor.properties");
+ }
if (propsURL != null) {
logger.logp(Level.FINE, getClass().getName(), "JSCompressorFactoryImpl", "org_dojotoolkit_compressor.properties is available");
InputStream is = null;
View
2  org.dojotoolkit.optimizer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Optimizer
Bundle-SymbolicName: org.dojotoolkit.optimizer
-Bundle-Version: 0.4.8
+Bundle-Version: 0.5.2
Import-Package: org.dojotoolkit.json,
org.dojotoolkit.server.util.resource,
org.dojotoolkit.server.util.rhino
View
BIN  org.dojotoolkit.optimizer/org/dojotoolkit/optimizer/CachingJSOptimizer.class
Binary file not shown
View
BIN  org.dojotoolkit.optimizer/org/dojotoolkit/optimizer/JSOptimizerFactoryImpl.class
Binary file not shown
View
16 org.dojotoolkit.optimizer/src/org/dojotoolkit/optimizer/CachingJSOptimizer.java
@@ -65,6 +65,22 @@ public JSAnalysisData getAnalysisData(String[] modules, JSAnalysisData[] exclude
}
}
if (jsAnalysisData == null || jsAnalysisData.isStale()) {
+ if (logger.isLoggable(Level.FINE)) {
+ boolean stale = jsAnalysisData == null ? false : jsAnalysisData.isStale();
+ StringBuffer moduleList = new StringBuffer();
+ for (String module: modules) {
+ moduleList.append(module);
+ moduleList.append(" ");
+ }
+ StringBuffer excludeList = new StringBuffer();
+ for (JSAnalysisData excluded: exclude) {
+ for (String excludeModule : excluded.getDependencies()) {
+ excludeList.append(excludeModule);
+ excludeList.append(" ");
+ }
+ }
+ logger.logp(Level.FINE, getClass().getName(), "getAnalysisData", "creating Analysis Data for modules["+moduleList+"] stale["+stale+"] key["+key+"] excluded["+excludeList+"]");
+ }
jsAnalysisData = _getAnalysisData(modules, exclude, pageConfig);
jsAnalysisData.save(tempDir);
cache.put(key, jsAnalysisData);
View
5 org.dojotoolkit.optimizer/src/org/dojotoolkit/optimizer/JSOptimizerFactoryImpl.java
@@ -20,7 +20,7 @@
public class JSOptimizerFactoryImpl implements JSOptimizerFactory {
private static Logger logger = Logger.getLogger("org.dojotoolkit.optimizer");
- private static final String DEFAULT_JS_OPTIMIZER_CLASS = "org.dojotoolkit.optimizer.rhinoast.RhinoJSOptimizer";
+ private static final String DEFAULT_JS_OPTIMIZER_CLASS = "org.dojotoolkit.optimizer.rhinoast.AMDJSOptimizer";
private Constructor<JSOptimizer> jsOptimizerConstructor = null;
@SuppressWarnings("unchecked")
@@ -28,6 +28,9 @@ public JSOptimizerFactoryImpl() {
try {
Class<JSOptimizer> jsOptimizerClass = null;
URL propsURL = getClass().getClassLoader().getResource("/org_dojotoolkit_optimizer.properties");
+ if (propsURL == null) {
+ propsURL = getClass().getResource("/org_dojotoolkit_optimizer.properties");
+ }
if (propsURL != null) {
logger.logp(Level.FINE, getClass().getName(), "JSOptimizerFactoryImpl", "org_dojotoolkit_optimizer.properties is available");
InputStream is = null;
Please sign in to comment.
Something went wrong with that request. Please try again.