[jboss-cvs] JBossAS SVN: r66997 - projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 12 19:53:40 EST 2007
Author: bstansberry at jboss.com
Date: 2007-11-12 19:53:40 -0500 (Mon, 12 Nov 2007)
New Revision: 66997
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/PassivationConfig.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/ReplicationConfig.java
Log:
[JBAS-4960] Get rid of unused String versions of properties; convert std properties to correct types
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-11-12 23:58:51 UTC (rev 66996)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java 2007-11-13 00:53:40 UTC (rev 66997)
@@ -647,16 +647,6 @@
{
this.flushOnSessionInvalidation = flushOnSessionInvalidation;
}
- /** FIXME Remove once a release with getMaxActiveSessions() is used by AS */
- public int getMaxActiveSession()
- {
- return maxActiveSessions == null ? -1 : maxActiveSessions.intValue();
- }
- /** FIXME Remove once a release with setMaxActiveSessions() is used by AS */
- public void setMaxActiveSession(int maxActiveSessions)
- {
- this.maxActiveSessions = maxActiveSessions;
- }
public Integer getMaxActiveSessions()
{
return maxActiveSessions;
@@ -1048,8 +1038,8 @@
if(override != null && override.arbitraryMetadata!= null)
setArbitraryMetadata(override.arbitraryMetadata);
- if(override != null && override.maxActiveSessions != null && override.maxActiveSessions != -1)
- setMaxActiveSession(override.maxActiveSessions);
+ if(override != null && override.maxActiveSessions != null)
+ setMaxActiveSessions(override.maxActiveSessions);
if(override != null && override.sessionCookies != -1)
setSessionCookies(override.sessionCookies);
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/PassivationConfig.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/PassivationConfig.java 2007-11-12 23:58:51 UTC (rev 66996)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/PassivationConfig.java 2007-11-13 00:53:40 UTC (rev 66997)
@@ -62,61 +62,62 @@
*/
private Integer passivationMaxIdleTime;
- public String getPassivationMaxIdleTime()
+ public Integer getPassivationMaxIdleTime()
{
- return passivationMaxIdleTime == null ? IGNORE : passivationMaxIdleTime.toString();
+ return passivationMaxIdleTime;
}
- public void setPassivationMaxIdleTime(String passivationMaxIdleTime)
+ public void setPassivationMaxIdleTime(Integer passivationMaxIdleTime)
{
- this.passivationMaxIdleTime = (passivationMaxIdleTime == null) ? null : Integer.valueOf(passivationMaxIdleTime);
+ this.passivationMaxIdleTime = passivationMaxIdleTime;
}
- public String getPassivationMinIdleTime()
+ public Integer getPassivationMinIdleTime()
{
- return passivationMinIdleTime == null ? IGNORE : passivationMinIdleTime.toString();
+ return passivationMinIdleTime;
}
- public void setPassivationMinIdleTime(String passivationMinIdleTime)
+ public void setPassivationMinIdleTime(Integer passivationMinIdleTime)
{
- this.passivationMinIdleTime = (passivationMinIdleTime == null) ? null : Integer.valueOf(passivationMinIdleTime);
+ this.passivationMinIdleTime = passivationMinIdleTime;
}
- public String getUseSessionPassivation()
+ public Boolean getUseSessionPassivation()
{
- return (useSessionPassivation == null) ? null : useSessionPassivation.toString();
+ return useSessionPassivation;
}
- public void setUseSessionPassivation(String useSessionPassivation)
- {
- this.useSessionPassivation = (useSessionPassivation == null) ? null : Boolean.valueOf(useSessionPassivation);
- }
-
+ /** FIXME Remove after next snapshot publication */
public Integer getPassivationMaxIdleTimeInteger()
{
return passivationMaxIdleTime;
}
+ /** FIXME Remove after next snapshot publication */
public void setPassivationMaxIdleTimeInteger(Integer passivationMaxIdleTime)
{
this.passivationMaxIdleTime = passivationMaxIdleTime;
}
+ /** FIXME Remove after next snapshot publication */
public Integer getPassivationMinIdleTimeInteger()
{
return passivationMinIdleTime;
}
+ /** FIXME Remove after next snapshot publication */
public void setPassivationMinIdleTimeInteger(Integer passivationMinIdleTime)
{
this.passivationMinIdleTime = passivationMinIdleTime;
}
+ /** FIXME Remove after next snapshot publication */
public Boolean getUseSessionPassivationBoolean()
{
return useSessionPassivation;
}
+ /** FIXME Remove after next snapshot publication */
public void setUseSessionPassivation(Boolean useSessionPassivation)
{
this.useSessionPassivation = useSessionPassivation;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/ReplicationConfig.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/ReplicationConfig.java 2007-11-12 23:58:51 UTC (rev 66996)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/web/jboss/ReplicationConfig.java 2007-11-13 00:53:40 UTC (rev 66997)
@@ -75,36 +75,6 @@
this.fieldBatchMode = fieldBatchMode;
}
- public String getTrigger()
- {
- return trigger == null ? null : trigger.toString();
- }
-
- public void setTrigger(String trigger)
- {
- this.trigger = (trigger == null ? null : ReplicationTrigger.fromString(trigger));
- }
-
- public String getGranularity()
- {
- return granularity == null ? null : granularity.toString();
- }
-
- public void setGranularity(String granularity)
- {
- this.granularity = (granularity == null ? null : ReplicationGranularity.fromString(granularity));
- }
-
- public String getFieldBatchMode()
- {
- return fieldBatchMode == null ? null : fieldBatchMode.toString();
- }
-
- public void setFieldBatchMode(String fieldBatchMode)
- {
- this.fieldBatchMode = fieldBatchMode == null ? null : new Boolean(Boolean.valueOf(fieldBatchMode));
- }
-
public String getCacheName()
{
return cacheName;
@@ -115,78 +85,72 @@
this.cacheName = cacheName;
}
- public String getSnapshotInterval()
+ public Integer getSnapshotInterval()
{
- return snapshotInterval == null ? null : snapshotInterval.toString();
+ return snapshotInterval;
}
- public void setSnapshotInterval(String snapshotInterval)
+ public void setSnapshotInterval(Integer snapshotInterval)
{
- this.snapshotInterval = (snapshotInterval == null) ? null : Integer.valueOf(snapshotInterval);
+ this.snapshotInterval = snapshotInterval;
}
+ /** FIXME Remove after next snapshot publication */
public Integer getSnapshotIntervalInteger()
{
return snapshotInterval == null ? 0 : snapshotInterval.intValue();
}
+ /** FIXME Remove after next snapshot publication */
public void setSnapshotIntervalInteger(Integer snapshotInterval)
{
this.snapshotInterval = snapshotInterval;
}
- public String getSnapshotMode()
+ public SnapshotMode getSnapshotMode()
{
- return snapshotMode == null ? null : snapshotMode.toString();
+ return snapshotMode;
}
- public void setSnapshotMode(String snapshotMode)
+ public void setSnapshotMode(SnapshotMode snapshotMode)
{
- this.snapshotMode = snapshotMode == null ? null : SnapshotMode.fromString(snapshotMode);
+ this.snapshotMode = snapshotMode;
}
+ /** FIXME Remove after next snapshot publication */
public SnapshotMode getSnapshotModeEnum()
{
return snapshotMode;
}
+ /** FIXME Remove after next snapshot publication */
public void setSnapshotModeEnum(SnapshotMode snapshotMode)
{
this.snapshotMode = snapshotMode;
}
- public String getUseJK()
+ public Boolean getUseJK()
{
- return useJK == null ? null : useJK.toString();
+ return useJK;
}
- public void setUseJK(String useJK)
+ public void setUseJK(Boolean useJK)
{
- this.useJK = (useJK == null) ? null : Boolean.valueOf(useJK);
+ this.useJK = useJK;
}
+ /** FIXME Remove after next snapshot publication */
public Boolean getUseJKBoolean()
{
return useJK;
}
+ /** FIXME Remove after next snapshot publication */
public void setUseJKBoolean(Boolean useJK)
{
this.useJK = useJK;
}
- /** FIXME Remove */
- public String getUseLocalCache()
- {
- return "true";
- }
-
- /** FIXME Remove */
- public void setUseLocalCache(String useLocalCache)
- {
- // no-op
- }
-
public String toString()
{
StringBuffer sb = new StringBuffer(100);
More information about the jboss-cvs-commits
mailing list