Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move main package to org.eclipse.wasp #34

Merged
merged 1 commit into from
Dec 8, 2021
Merged

Move main package to org.eclipse.wasp #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,14 +161,14 @@
<compilerArgument>-Xlint:unchecked</compilerArgument>
<excludes>
<exclude>
org/apache/jasper/compiler/JDTJavaCompiler.java
org/glassfish/wasp/compiler/JDTJavaCompiler.java
</exclude>
<exclude>
org/apache/jasper/compiler/AntJavaCompiler.java
org/glassfish/wasp/compiler/AntJavaCompiler.java
</exclude>
<exclude>
<!-- This is only used by AntJavaCompiler -->
org/apache/jasper/util/SystemLogHandler.java
org/glassfish/wasp/util/SystemLogHandler.java
</exclude>
</excludes>
</configuration>
Expand Down Expand Up @@ -252,12 +252,12 @@
<configuration>
<source>11</source>
<additionalJOption>-Xdoclint:none</additionalJOption>
<excludePackageNames>org.apache.jasper.util</excludePackageNames>
<excludePackageNames>org.glassfish.wasp.util</excludePackageNames>
<quiet>true</quiet>
<groups>
<group>
<title>WaSP ${project.version}</title>
<packages>org.apache.jasper</packages>
<packages>org.glassfish.wasp</packages>
<packages>org.glassfish.jsp.api</packages>
</group>
</groups>
Expand Down
1 change: 0 additions & 1 deletion src/main/java/org/glassfish/jsp/api/JspProbeEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
* A web container can pass an implementation of this interface in the context attribute
* "org.glassfish.jsp.monitor.probeEmitter".
*/

public interface JspProbeEmitter {

void jspLoadedEvent(String jspUri);
Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/org/apache/jasper/Constants.java → ...in/java/org/glassfish/wasp/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.jasper;
package org.glassfish.wasp;

/**
* Some constants and other global data that are used by the compiler and the runtime.
Expand All @@ -29,7 +29,7 @@ public class Constants {
/**
* The base class of the generated servlets.
*/
public static final String JSP_SERVLET_BASE = "org.apache.jasper.runtime.HttpJspBase";
public static final String JSP_SERVLET_BASE = "org.glassfish.wasp.runtime.HttpJspBase";

/**
* _jspService is the name of the method that is called by HttpJspBase.service(). This is where most of the code
Expand Down Expand Up @@ -208,6 +208,6 @@ public class Constants {
* Name of the ServletContext init-param that determines if the XML parsers will block the resolution of external
* entities.
*/
public static final String XML_BLOCK_EXTERNAL_INIT_PARAM = "org.apache.jasper.XML_BLOCK_EXTERNAL";
public static final String XML_BLOCK_EXTERNAL_INIT_PARAM = "org.glassfish.wasp.XML_BLOCK_EXTERNAL";

}
68 changes: 27 additions & 41 deletions ...apache/jasper/EmbeddedServletOptions.java → ...lassfish/wasp/EmbeddedServletOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.jasper;
package org.glassfish.wasp;

import java.io.File;
import java.text.MessageFormat;
Expand All @@ -25,10 +25,10 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import org.apache.jasper.compiler.JspConfig;
import org.apache.jasper.compiler.Localizer;
import org.apache.jasper.compiler.TagPluginManager;
import org.apache.jasper.runtime.TldScanner;
import org.glassfish.wasp.compiler.JspConfig;
import org.glassfish.wasp.compiler.Localizer;
import org.glassfish.wasp.compiler.TagPluginManager;
import org.glassfish.wasp.runtime.TldScanner;

import jakarta.servlet.ServletConfig;
import jakarta.servlet.ServletContext;
Expand All @@ -48,7 +48,7 @@ public final class EmbeddedServletOptions implements Options {
private Properties settings = new Properties();

/**
* Is Jasper being used in development mode?
* Is Wasp being used in development mode?
*/
private boolean development = true;

Expand All @@ -60,17 +60,17 @@ public final class EmbeddedServletOptions implements Options {
/**
* Do you want to keep the generated Java files around?
*/
private boolean keepGenerated = false;
private boolean keepGenerated;

/**
* If class files are generated as byte arrays, should they be saved to disk at the end of compilations?
*/
private boolean saveBytecode = false;
private boolean saveBytecode;

/**
* Should white spaces between directives or actions be trimmed?
*/
private boolean trimSpaces = false;
private boolean trimSpaces;

/**
* Determines whether tag handler pooling is enabled.
Expand All @@ -87,7 +87,7 @@ public final class EmbeddedServletOptions implements Options {
* Do you want stack traces and such displayed in the client's browser? If this is false, such messages go to the
* standard error or a log file if the standard error is redirected.
*/
private boolean sendErrorToClient = false;
private boolean sendErrorToClient;

/**
* Do we want to include debugging information in the class file?
Expand All @@ -102,23 +102,23 @@ public final class EmbeddedServletOptions implements Options {
/**
* Is the generation of SMAP info for JSR45 debuggin suppressed?
*/
private boolean isSmapSuppressed = false;
private boolean isSmapSuppressed;

/**
* Should SMAP info for JSR45 debugging be dumped to a file?
*/
private boolean isSmapDumped = false;
private boolean isSmapDumped;

/**
* Are Text strings to be generated as char arrays?
*/
private boolean genStringAsCharArray = false;
private boolean genStringAsCharArray;

private boolean genStringAsByteArray = true;

private boolean defaultBufferNone = false;
private boolean defaultBufferNone;

private boolean errorOnUseBeanInvalidClassAttribute = false;
private boolean errorOnUseBeanInvalidClassAttribute;

/**
* I want to see my generated servlets. Which directory are they in?
Expand All @@ -134,16 +134,14 @@ public final class EmbeddedServletOptions implements Options {
/**
* What classpath should I use while compiling generated servlets?
*/
private String classpath = null;
private String classpath;

// START PWC 1.2 6311155
private String sysClassPath = null;
// END PWC 1.2 6311155
private String sysClassPath;

/**
* Compiler to use.
*/
private String compiler = null;
private String compiler;

/**
* Compiler target VM.
Expand All @@ -158,25 +156,25 @@ public final class EmbeddedServletOptions implements Options {
/**
* The compiler class name.
*/
private String compilerClassName = null;
private String compilerClassName;

/**
* Cache for the TLD locations
*/
private TldScanner tldScanner = null;
private TldScanner tldScanner;

/**
* Jsp config information
*/
private JspConfig jspConfig = null;
private JspConfig jspConfig;

/**
* TagPluginManager
*/
private TagPluginManager tagPluginManager = null;
private TagPluginManager tagPluginManager;

/**
* Java platform encoding to generate the JSP page servlet.
* Java platform encoding to generate the Jakarta Pages page servlet.
*/
private String javaEncoding = "UTF8";

Expand All @@ -190,20 +188,14 @@ public final class EmbeddedServletOptions implements Options {
*/
private boolean xpoweredBy;

// BEGIN S1AS 6181923
private boolean usePrecompiled;
// END S1AS 6181923

// START SJSAS 6384538
private boolean isValidationEnabled;
// END SJSAS 6384538

// START SJSWS
/*
* Initial capacity of HashMap which maps JSPs to their corresponding servlets
*/
private int initialCapacity = Constants.DEFAULT_INITIAL_CAPACITY;
// END SJSWS

public String getProperty(String name) {
return settings.getProperty(name);
Expand Down Expand Up @@ -282,15 +274,15 @@ public int getModificationTestInterval() {
}

/**
* Is Jasper being used in development mode?
* Is Wasp being used in development mode?
*/
@Override
public boolean getDevelopment() {
return development;
}

/**
* Is the generation of SMAP info for JSR45 debuggin suppressed?
* Is the generation of SMAP info for JSR45 debugging suppressed?
*/
@Override
public boolean isSmapSuppressed() {
Expand Down Expand Up @@ -433,32 +425,26 @@ public TagPluginManager getTagPluginManager() {
return tagPluginManager;
}

// START SJSWS
/**
* Gets initial capacity of HashMap which maps JSPs to their corresponding servlets.
*/
@Override
public int getInitialCapacity() {
return initialCapacity;
}
// END SJSWS

// BEGIN S1AS 6181923
/**
* Returns the value of the usePrecompiled (or use-precompiled) init param.
*/
@Override
public boolean getUsePrecompiled() {
return usePrecompiled;
}
// END S1AS 6181923

// START SJSAS 6384538
@Override
public boolean isValidationEnabled() {
return isValidationEnabled;
}
// END SJSAS 6384538

/**
* Create an EmbeddedServletOptions object using data available from ServletConfig and ServletContext.
Expand Down Expand Up @@ -648,9 +634,9 @@ public EmbeddedServletOptions(ServletConfig config, ServletContext context) {

String jspCompilerPlugin = config.getInitParameter("javaCompilerPlugin");
if (jspCompilerPlugin != null) {
if ("org.apache.jasper.compiler.JikesJavaCompiler".equals(jspCompilerPlugin)) {
if ("org.glassfish.wasp.compiler.JikesJavaCompiler".equals(jspCompilerPlugin)) {
this.compiler = "jikes";
} else if ("org.apache.jasper.compiler.SunJava14Compiler".equals(jspCompilerPlugin)) {
} else if ("org.glassfish.wasp.compiler.SunJava14Compiler".equals(jspCompilerPlugin)) {
// use default, do nothing
} else {
// use default, issue warning
Expand Down
Loading