Author: tcurdt
Date: Sat Mar 24 11:09:47 2007
New Revision: 522076
URL: http://svn.apache.org/viewvc?view=rev&rev=522076
Log:
work around (for now) as the compiler refuse to compiler .jsp resources
Added:
jakarta/commons/sandbox/jci/trunk/examples/src/main/webapp/WEB-INF/jsp/Test.jsp
- copied unchanged from r522054,
jakarta/commons/sandbox/jci/trunk/examples/src/main/webapp/WEB-INF/jsp/Test.java
jakarta/commons/sandbox/jci/trunk/examples/src/main/webapp/WEB-INF/jsp/org/vafer/Test.jsp
- copied unchanged from r522054,
jakarta/commons/sandbox/jci/trunk/examples/src/main/webapp/WEB-INF/jsp/org/vafer/Test.java
Removed:
jakarta/commons/sandbox/jci/trunk/examples/src/main/webapp/WEB-INF/jsp/Test.java
jakarta/commons/sandbox/jci/trunk/examples/src/main/webapp/WEB-INF/jsp/org/vafer/Test.java
Modified:
jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java
jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspReader.java
jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java
Modified:
jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java?view=diff&rev=522076&r1=522075&r2=522076
==============================================================================
---
jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java
(original)
+++
jakarta/commons/sandbox/jci/trunk/core/src/main/java/org/apache/commons/jci/listeners/CompilingListener.java
Sat Mar 24 11:09:47 2007
@@ -75,6 +75,10 @@
public ResourceReader getReader( final FilesystemAlterationObserver
pObserver ) {
return new FileResourceReader(pObserver.getRootDirectory());
}
+
+ public String getSourceNameFromFile( final FilesystemAlterationObserver
pObserver, final File pFile ) {
+ return
ConversionUtils.stripExtension(ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(),
pFile))) + getSourceFileExtension();
+ }
public ResourceStore getStore() {
return transactionalStore;
@@ -144,7 +148,7 @@
final String[] sourceFiles = new String[compileables.size()];
for (Iterator it = compileables.iterator(); it.hasNext();) {
final File file = (File) it.next();
- final String resourceName =
ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(),
file));
+ final String resourceName = getSourceNameFromFile(pObserver,
file);
sourceFiles[i] = resourceName;
i++;
}
Modified:
jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspReader.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspReader.java?view=diff&rev=522076&r1=522075&r2=522076
==============================================================================
---
jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspReader.java
(original)
+++
jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/JspReader.java
Sat Mar 24 11:09:47 2007
@@ -151,21 +151,28 @@
}
public byte[] getBytes( String pResourceName ) {
- final byte[] resourceBytes = reader.getBytes(pResourceName);
- if (resourceBytes == null) {
- return null;
+ if (pResourceName.endsWith(".java")) {
+
+ final String jspResourceName =
ConversionUtils.stripExtension(pResourceName) + ".jsp";
+ final byte[] resourceBytes =
reader.getBytes(jspResourceName);
+
+ if (resourceBytes == null) {
+ return null;
+ }
+
+ final byte[] jspServletCode =
transform(jspResourceName, resourceBytes);
+
+ System.out.println(new String(jspServletCode));
+
+ return jspServletCode;
}
- final byte[] jspServletCode = transform(pResourceName,
resourceBytes);
-
- System.out.println(new String(jspServletCode));
-
- return jspServletCode;
+ return reader.getBytes(pResourceName);
}
public boolean isAvailable( String pResourceName ) {
- return reader.isAvailable(pResourceName);
+ return reader.isAvailable(pResourceName) ||
reader.isAvailable(ConversionUtils.stripExtension(pResourceName) + ".jsp");
}
}
Modified:
jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java
URL:
http://svn.apache.org/viewvc/jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java?view=diff&rev=522076&r1=522075&r2=522076
==============================================================================
---
jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java
(original)
+++
jakarta/commons/sandbox/jci/trunk/examples/src/main/java/org/apache/commons/jci/examples/serverpages/ServerPageServlet.java
Sat Mar 24 11:09:47 2007
@@ -118,8 +118,12 @@
jspListener = new CompilingListener(new
JavaCompilerFactory().createCompiler("eclipse"), store) {
public String getSourceFileExtension() {
- return ".java";
+ return ".jsp";
}
+
+ public String getSourceNameFromFile( final
FilesystemAlterationObserver pObserver, final File pFile ) {
+ return
ConversionUtils.stripExtension(ConversionUtils.getResourceNameFromFileName(ConversionUtils.relative(pObserver.getRootDirectory(),
pFile))) + ".java";
+ }
public ResourceReader getReader( final
FilesystemAlterationObserver pObserver ) {
return new
JspReader(super.getReader(pObserver));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
