From svnnotify ¡÷ sourceforge.jp Wed Jul 2 10:15:31 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 02 Jul 2008 10:15:31 +0900 Subject: [pal-cvs 3269] [1003] apply patch 'r672043: shibboleth filter' Message-ID: <1214961331.474225.4612.nullmailer@users.sourceforge.jp> Revision: 1003 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1003 Author: sone Date: 2008-07-02 10:15:31 +0900 (Wed, 02 Jul 2008) Log Message: ----------- apply patch 'r672043: shibboleth filter' Added Paths: ----------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethConfiguration.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/alternate/shibboleth.xml -------------- next part -------------- Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethConfiguration.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethConfiguration.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethConfiguration.java 2008-07-02 01:15:31 UTC (rev 1003) @@ -0,0 +1,58 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jetspeed.security.impl.shibboleth; + +import java.util.Map; + +import org.apache.jetspeed.administration.PortalConfiguration; +import org.apache.jetspeed.administration.PortalConfigurationConstants; + + +public class ShibbolethConfiguration +{ + public static final String USERNAME = "username"; + + private Map headerMapping; + private boolean authenticate; + private String guestUser; + + public ShibbolethConfiguration(Map headerMapping, boolean authenticate, PortalConfiguration config) + { + this.headerMapping = headerMapping; + this.authenticate = authenticate; + this.guestUser = config.getString(PortalConfigurationConstants.USERS_DEFAULT_GUEST); + } + + public boolean isAuthenticate() + { + return authenticate; + } + + + public Map getHeaderMapping() + { + return headerMapping; + } + + + public String getGuestUser() + { + return guestUser; + } + + +} Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/shibboleth/ShibbolethPortalFilter.java 2008-07-02 01:15:31 UTC (rev 1003) @@ -0,0 +1,193 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jetspeed.security.impl.shibboleth; + +import java.io.IOException; +import java.security.Principal; +import java.util.HashSet; +import java.util.Set; + +import javax.security.auth.Subject; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.apache.jetspeed.Jetspeed; +import org.apache.jetspeed.PortalReservedParameters; +import org.apache.jetspeed.administration.PortalAuthenticationConfiguration; +import org.apache.jetspeed.audit.AuditActivity; +import org.apache.jetspeed.login.LoginConstants; +import org.apache.jetspeed.login.filter.PortalRequestWrapper; +import org.apache.jetspeed.security.SecurityException; +import org.apache.jetspeed.security.SecurityHelper; +import org.apache.jetspeed.security.User; +import org.apache.jetspeed.security.UserManager; +import org.apache.jetspeed.security.UserPrincipal; +import org.apache.jetspeed.security.impl.PrincipalsSet; +import org.apache.jetspeed.security.impl.UserSubjectPrincipalImpl; + +public class ShibbolethPortalFilter implements Filter +{ + protected String userNameHeader; + protected Object sem = new Object(); + + public void init(FilterConfig filterConfig) throws ServletException + { + } + + public void doFilter(ServletRequest sRequest, + ServletResponse sResponse, FilterChain filterChain) + throws IOException, ServletException + { + if (sRequest instanceof HttpServletRequest) + { + HttpServletRequest request = (HttpServletRequest)sRequest; + if (userNameHeader == null) + { + synchronized (sem) + { + ShibbolethConfiguration config = (ShibbolethConfiguration)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.security.shibboleth.ShibbolethConfiguration"); + userNameHeader = config.getHeaderMapping().get(ShibbolethConfiguration.USERNAME); + } + } + String username = request.getHeader(userNameHeader); + if (username != null) + { + Subject subject = (Subject)request.getSession().getAttribute(PortalReservedParameters.SESSION_KEY_SUBJECT); + if (subject != null) + { + Principal principal = SecurityHelper.getPrincipal(subject, UserPrincipal.class); + if (principal != null) + { + if (principal.getName().equals(username)) + { + sRequest = wrapperRequest(request, subject, principal); + if (filterChain != null) + { + filterChain.doFilter(sRequest, sResponse); + return; + } + } + } + } + UserManager userManager = (UserManager)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.security.UserManager"); + AuditActivity audit = (AuditActivity)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.audit.AuditActivity"); + ShibbolethConfiguration config = (ShibbolethConfiguration)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.security.shibboleth.ShibbolethConfiguration"); + boolean success = false; + if (config.isAuthenticate()) + { + success = userManager.authenticate(username, username); // TODO: this is bogus, need to login with a real password. + } + else + { + try + { + // load the user principals (roles, groups, credentials) + User user = userManager.getUser(username); + if (user != null) + { + subject = user.getSubject(); + } + success = true; + } + catch (SecurityException sex) + { + success = false; + } + } + if (success) + { + audit.logUserActivity(username, request.getRemoteAddr(), AuditActivity.AUTHENTICATION_SUCCESS, "ShibbolethFilter"); + PortalAuthenticationConfiguration authenticationConfiguration = (PortalAuthenticationConfiguration) + Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.administration.PortalAuthenticationConfiguration"); + if (authenticationConfiguration.isCreateNewSessionOnLogin()) + { + request.getSession().invalidate(); + } + subject = null; + try + { + // load the user principals (roles, groups, credentials) + User user = userManager.getUser(username); + if ( user != null ) + { + subject = user.getSubject(); + } + } + catch (SecurityException sex) + { + } + if (subject == null) + { + Set principals = new PrincipalsSet(); + UserSubjectPrincipalImpl userPrincipal = new UserSubjectPrincipalImpl(username); + principals.add(userPrincipal); + subject = new Subject(true, principals, new HashSet(), new HashSet()); + userPrincipal.setSubject(subject); + } + Principal principal = SecurityHelper.getPrincipal(subject, UserPrincipal.class); + sRequest = wrapperRequest(request, subject, principal); + request.getSession().removeAttribute(LoginConstants.ERRORCODE); + HttpSession session = request.getSession(true); + session.setAttribute(PortalReservedParameters.SESSION_KEY_SUBJECT, subject); + } + else + { + audit.logUserActivity(username, request.getRemoteAddr(), AuditActivity.AUTHENTICATION_FAILURE, "ShibbolethFilter"); + request.getSession().setAttribute(LoginConstants.ERRORCODE, LoginConstants.ERROR_INVALID_PASSWORD); + } + } + else + { + Subject subject = (Subject)request.getSession().getAttribute(PortalReservedParameters.SESSION_KEY_SUBJECT); + if (subject != null) + { + Principal principal = SecurityHelper.getPrincipal(subject, UserPrincipal.class); + ShibbolethConfiguration config = (ShibbolethConfiguration)Jetspeed.getComponentManager().getComponent("org.apache.jetspeed.security.shibboleth.ShibbolethConfiguration"); + if (principal != null && principal.getName().equals(config.getGuestUser())) + { + } + else + { + sRequest = wrapperRequest(request, subject, principal); + } + } + } + sRequest.setAttribute(PortalReservedParameters.PORTAL_FILTER_ATTRIBUTE, "true"); + } + + if (filterChain != null) + { + filterChain.doFilter(sRequest, sResponse); + } + } + + private ServletRequest wrapperRequest(HttpServletRequest request, Subject subject, Principal principal) + { + PortalRequestWrapper wrapper = new PortalRequestWrapper(request, subject, principal); + return wrapper; + } + + public void destroy() + { + } +} Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/alternate/shibboleth.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/alternate/shibboleth.xml (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/alternate/shibboleth.xml 2008-07-02 01:15:31 UTC (rev 1003) @@ -0,0 +1,41 @@ + + + + + + + + + + shib-person-commonname + + + + + + true + + + + + + + + From svnnotify ¡÷ sourceforge.jp Wed Jul 2 13:21:31 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 02 Jul 2008 13:21:31 +0900 Subject: [pal-cvs 3270] [1004] apply patch 'r667492: New HealthCheck feature' Message-ID: <1214972491.504907.13601.nullmailer@users.sourceforge.jp> Revision: 1004 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1004 Author: sone Date: 2008-07-02 13:21:31 +0900 (Wed, 02 Jul 2008) Log Message: ----------- apply patch 'r667492: New HealthCheck feature' Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml Added Paths: ----------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java -------------- next part -------------- Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DataSourcesValidationBean.java 2008-07-02 04:21:31 UTC (rev 1004) @@ -0,0 +1,63 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jetspeed.healthcheck.validators; + +import java.util.List; + +/** + * Bean to be used by validators that need to execute a validation query against a list of datasources + * + * @author Ruben Carvalho + * @version $Id$ + */ +public class DataSourcesValidationBean +{ + /** + * The SQL query. + */ + private String validationQuery; + /** + * List of datasources. + */ + private List datasources; + + public DataSourcesValidationBean(String validationQuery, List datasources) + { + this.validationQuery = validationQuery; + this.datasources = datasources; + } + + /** + * Getter method for validationQuery + * + * @return The validation query. + */ + public String getValidationQuery() + { + return validationQuery; + } + + /** + * Getter method for datasources + * + * @return The list of datasources. + */ + public List getDatasources() + { + return datasources; + } +} \ No newline at end of file Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java 2008-07-02 04:21:31 UTC (rev 1004) @@ -0,0 +1,207 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jetspeed.healthcheck.validators; + +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import javax.sql.DataSource; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.jdbc.support.JdbcUtils; + +/** + * Validator to check if the defined datasources are up and running + * + * @author Ruben Carvalho + * @version $Id$ + */ +public class DatasourceAvailableHealthCheckValidator implements HealthCheckValidator +{ + private static final Log log = LogFactory.getLog(DatasourceAvailableHealthCheckValidator.class); + public static boolean isInfoEnabled = log.isInfoEnabled(); + public static boolean isDebugEnabled = log.isDebugEnabled(); + /** + * Spring property resources. Maps the database name to a list of datasources. + */ + private Map resources; + /** + * Spring property numberOfRetries. + */ + private int numberOfRetries; + /** + * Spring property retryDelay. + */ + private long retryDelay; + /** + * Spring property stopValidationOnError. + */ + private boolean stopValidationOnError; + /** + * Spring property requireAllValid. + */ + private boolean requireAllValid; + + public DatasourceAvailableHealthCheckValidator(Map resources, int numberOfRetries, long retryDelay, + boolean stopValidationOnError, boolean requireAllValid) + { + this.resources = resources; + this.numberOfRetries = numberOfRetries; + this.retryDelay = retryDelay; + this.stopValidationOnError = stopValidationOnError; + this.requireAllValid = requireAllValid; + } + + public HealthCheckValidatorResult validate() + { + if (isDebugEnabled) + { + log.debug("Starting method: DatasourceAvailableHealthCheckValidator.validate()"); + } + HealthCheckValidatorResult result = new HealthCheckValidatorResult(); + boolean allDataSourcesStatus = true; + StringBuffer messages = new StringBuffer(); + try + { + Set dbNames = resources.keySet(); + for (Iterator it = dbNames.iterator(); it.hasNext();) + { + String dbName = (String) it.next(); + if (messages.length()>0) + { + messages.append(LINE_SEPARATOR); + } + messages.append(dbName + ":"); + if (isDebugEnabled) + { + log.debug("Database: " + dbName); + } + DataSourcesValidationBean dsBean = (DataSourcesValidationBean) resources.get(dbName); + String validationQuery = dsBean.getValidationQuery(); + boolean dbStatus = true; + for (Iterator it2 = dsBean.getDatasources().iterator(); it2.hasNext();) + { + DataSource ds = (DataSource) it2.next(); + dbStatus = isDatasourceValid(validationQuery, ds); + if (dbStatus) + { + // the ds is up + if (!requireAllValid) + { + // only 1 datasource is required to be available so + // we can interrupt this loop + break; + } + } + else + { + // the ds is not available + if (requireAllValid) + { + // all datasource(s) need to be available so + // we can interrupt this loop + break; + } + } + } + if (dbStatus) + { + messages.append(" is up"); + } + else + { + // none of the datasources for this DB is available so + // fail the whole validator + allDataSourcesStatus = false; + messages.append(" is down"); + } + if (stopValidationOnError && !allDataSourcesStatus) + { + // the validator has failed and stopValidationOnError + // is true so we have to interrupt the validator + break; + } + } + if (!allDataSourcesStatus) + { + result.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); + } + } + catch (Exception e) + { + // if any exceptions occur, even runtime exceptions, return a failed + // result + log.error("Exception while running the datasource validator", e); + result.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); + messages.append("Exception while running the datasource validator: " + e.getMessage()); + } + if (isDebugEnabled) + { + log.debug(messages.toString()); + } + result.setResultMessage(messages.toString()); + return result; + } + + /** + * Checks is a datasource is valid or not by executing a validationQuery + * + * @param validationQuery + * The query to be executed + * @param dataSource + * The datasource to be checked + * @return Whether the datasource is available or not + */ + private boolean isDatasourceValid(String validationQuery, DataSource dataSource) + { + boolean dsStatus = true; + Connection con = null; + Statement stmt = null; + try + { + con = dataSource.getConnection(); + stmt = con.createStatement(); + stmt.execute(validationQuery); + } + catch (SQLException ex) + { + dsStatus = false; + log.error("The datasource is not available", ex); + } + finally + { + JdbcUtils.closeStatement(stmt); + JdbcUtils.closeConnection(con); + } + return dsStatus; + } + + public int getNumberOfRetries() + { + return numberOfRetries; + } + + public long getRetryDelay() + { + return retryDelay; + } +} \ No newline at end of file Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidator.java 2008-07-02 04:21:31 UTC (rev 1004) @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jetspeed.healthcheck.validators; + +import org.apache.jetspeed.pipeline.valve.HealthCheckValve; + +/** + * Interface to be implemented by validator classes which will be injected in {@link HealthCheckValve}. + * + * @author Ruben Carvalho + * @version $Id$ + */ +public interface HealthCheckValidator +{ + static final String LINE_SEPARATOR = System.getProperty("line.separator"); + + /** + * This method performs the validation and returns the status of the execution + * + * @return An instance of HealthCheckValidatorResult with the result code + */ + HealthCheckValidatorResult validate(); + + /** + * This method returns the number of times the validate() method should be re-executed if it fails the first time. + * + * @return Number of times to re-execute validate() + */ + int getNumberOfRetries(); + + /** + * This method returns the amount of time between each execution of the validate() method + * + * @return The amount of time between each execution of validate() + */ + long getRetryDelay(); +} \ No newline at end of file Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/HealthCheckValidatorResult.java 2008-07-02 04:21:31 UTC (rev 1004) @@ -0,0 +1,103 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jetspeed.healthcheck.validators; + +/** + * This class is returned as the result of executing the validation method from a Validator class + * + * @author Ruben Carvalho + * @version $Id$ + */ +public class HealthCheckValidatorResult +{ + /** + * Validator constant which indicates a successful validation + */ + public static final int VALIDATOR_SUCCEEDED = 101; + + /** + * Validator constant which indicates a failed validation + */ + public static final int VALIDATOR_FAILED = 100; + + /** + * Result code. One of VALIDATOR_* + */ + private int healthCheckResult; + + /** + * The result message + */ + private String resultMessage; + + public HealthCheckValidatorResult() + { + this.healthCheckResult = HealthCheckValidatorResult.VALIDATOR_SUCCEEDED; + this.resultMessage = ""; + } + + public HealthCheckValidatorResult(int healthCheckResult, String resultMessage) + { + this.healthCheckResult = healthCheckResult; + this.resultMessage = resultMessage; + } + + /** + * This method returns the result of running HealthCheckValidator.validate().

The result + * has to be one of the constants VALIDATOR_* + * + * @return Result from the execution of the validate() method. + */ + public int getHealthCheckResult() + { + return healthCheckResult; + } + + /** + * Setter method for healthCheckResult + * + * @param healthCheckResult + * The new code for healthCheckResult + */ + public void setHealthCheckResult(int healthCheckResult) + { + this.healthCheckResult = healthCheckResult; + } + + /** + * This method returns a message for this validator's execution.

This method should not be used to check + * if a validator ran successfully or not. That should be done by checking + * healthCheckResult() == VALIDATOR_FAILED + * + * @return The execution message (if any) + */ + public String getResultMessage() + { + return resultMessage; + } + + /** + * Setter method for resultMessage + * + * @param resultMessage + * The new result message + */ + public void setResultMessage(String resultMessage) + { + this.resultMessage = resultMessage; + } +} \ No newline at end of file Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java 2008-07-02 04:21:31 UTC (rev 1004) @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jetspeed.healthcheck.validators; + +import java.util.Iterator; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.jetspeed.components.portletregistry.PortletRegistry; +import org.apache.jetspeed.factory.PortletFactory; +import org.apache.jetspeed.om.common.portlet.PortletApplication; + +/** + * Validator to check if the defined required applications have been initialised in the Jetspeed engine + * + * @author Ruben Carvalho + * @version $Id$ + */ +public class PortletApplicationAvailableHeathCheckValidator implements HealthCheckValidator +{ + private static final Log log = LogFactory.getLog(PortletApplicationAvailableHeathCheckValidator.class); + public static boolean isInfoEnabled = log.isInfoEnabled(); + public static boolean isDebugEnabled = log.isDebugEnabled(); + /** + * Spring property numberOfRetries. + */ + private int numberOfRetries; + /** + * Spring property retryDelay. + */ + private long retryDelay; + /** + * Spring property retryDelay. + */ + private List requiredPortletApplications; + /** + * Spring property portletRegistry. + */ + private PortletRegistry portletRegistry; + /** + * Spring property portletFactory. + */ + private PortletFactory portletFactory; + /** + * Spring property stopValidationOnError. + */ + private boolean stopValidationOnError; + + public PortletApplicationAvailableHeathCheckValidator(List requiredPortletApplications, int numberOfRetries, + long retryDelay, PortletRegistry portletRegistry, + PortletFactory portletFactory, boolean stopValidationOnError) + { + this.requiredPortletApplications = requiredPortletApplications; + this.numberOfRetries = numberOfRetries; + this.retryDelay = retryDelay; + this.portletRegistry = portletRegistry; + this.portletFactory = portletFactory; + this.stopValidationOnError = stopValidationOnError; + } + + public HealthCheckValidatorResult validate() + { + HealthCheckValidatorResult result = new HealthCheckValidatorResult(); + boolean allPAStatus = true; + StringBuffer messages = new StringBuffer(); + try + { + // check if all required apps have been registered and are + // available. + for (Iterator it = requiredPortletApplications.iterator(); it.hasNext();) + { + // the portlet application name + String paName = (String) it.next(); + if (isDebugEnabled) + { + log.debug("Checking portlet application: " + paName); + } + if (messages.length()>0) + { + messages.append(LINE_SEPARATOR); + } + messages.append(paName + ": "); + PortletApplication pa = portletRegistry.getPortletApplication(paName); + boolean thisPAStatus = portletFactory.isPortletApplicationRegistered(pa); + if (thisPAStatus) + { + messages.append("is up"); + } + else + { + messages.append("is down"); + allPAStatus = false; + if (stopValidationOnError) + { + break; + } + } + } + if (!allPAStatus) + { + result.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); + } + } + catch (Exception e) + { + // if any exceptions occur, even runtime exceptions, return a failed + // result + log.error("Exception while running the portlet application validator", e); + result.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); + messages.append("Exception while running the portlet application validator: " + e.getMessage()); + } + if (isDebugEnabled) + { + log.debug(messages.toString()); + } + result.setResultMessage(messages.toString()); + return result; + } + + public int getNumberOfRetries() + { + return numberOfRetries; + } + + public long getRetryDelay() + { + return retryDelay; + } +} \ No newline at end of file Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java 2008-07-02 04:21:31 UTC (rev 1004) @@ -0,0 +1,198 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jetspeed.pipeline.valve; + +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.jetspeed.healthcheck.validators.HealthCheckValidator; +import org.apache.jetspeed.healthcheck.validators.HealthCheckValidatorResult; +import org.apache.jetspeed.pipeline.PipelineException; +import org.apache.jetspeed.pipeline.valve.AbstractValve; +import org.apache.jetspeed.pipeline.valve.ValveContext; +import org.apache.jetspeed.request.RequestContext; + +/** + * Valve that performs a health check based on the validators injected from a Spring configutation file. + * + * @author Ruben Carvalho + * @version $Id$ + */ +public class HealthCheckValve extends AbstractValve +{ + static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final Log log = LogFactory.getLog(HealthCheckValve.class); + public static boolean isInfoEnabled = log.isInfoEnabled(); + public static boolean isDebugEnabled = log.isDebugEnabled(); + /** + * Spring property validators. List of validators to be executed by this Valve + */ + private List validators; + /** + * Spring property successMessage. This String is added to the response if all validators succeed + */ + private String successMessage; + /** + * Spring property failMessage. The string to be added to the response if one of the validators fails + */ + private String failMessage; + /** + * Spring property addValidationMessagesToResponse. Whether messages returned in the validator result should be + * appended to the http response or not + */ + private boolean addValidationMessagesToResponse; + /** + * Spring property stopValidationOnError. Whether the valve execution should continue or stop if one validator fails + */ + private boolean stopValidationOnError; + + public HealthCheckValve(List validators, String successMessage, String failMessage, + boolean addValidationMessagesToResponse, boolean stopValidationOnError) + { + this.validators = validators; + this.successMessage = successMessage; + this.failMessage = failMessage; + this.addValidationMessagesToResponse = addValidationMessagesToResponse; + this.stopValidationOnError = stopValidationOnError; + } + + public void invoke(RequestContext request, ValveContext context) throws PipelineException + { + if (isDebugEnabled) + { + log.debug("Starting method: HealthCheckValve.invoke()"); + } + List messages = new ArrayList(); + HttpServletResponse response = request.getResponse(); + boolean healthCheckStatus = true; + try + { + // iterate all validators and execute its validate method. + for (Iterator it = validators.iterator(); it.hasNext();) + { + HealthCheckValidator hcv = (HealthCheckValidator) it.next(); + if (isDebugEnabled) + { + log.debug("Starting validator execution: " + hcv.getClass().getName()); + } + HealthCheckValidatorResult result = null; + // execute the validator until it succeeds or until the + // number of retries runs out + for (int i = 0; i <= hcv.getNumberOfRetries(); i++) + { + result = hcv.validate(); + if (isDebugEnabled) + { + log.debug("Validator execution: " + + (result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED)); + } + if (result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED) + { + // the validator succeeded so stop this loop and go for + // the next validator + break; + } + if ((i + 1) <= hcv.getNumberOfRetries()) + { + // the validator did not succeed. If there are any + // retries left and if a retry delay was defined then + // wait before re-executing the same validator + if (hcv.getRetryDelay() > 0) + { + try + { + Thread.sleep(hcv.getRetryDelay()); + } + catch (InterruptedException e) + { + } + } + } + } + if (result != null) + { + if (addValidationMessagesToResponse) + { + messages.add(result.getResultMessage()); + } + if (!(result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED)) + { + // this validator failed so mark the health check as + // failed + healthCheckStatus = false; + if (stopValidationOnError) + { + // stopValidationOnError is true so stop the health + // check + break; + } + } + } + } + PrintWriter pw = response.getWriter(); + if (healthCheckStatus) + { + // if all validators succeeded, add the success message to the + // http response + pw.write(successMessage); + } + else + { + pw.write(failMessage); + } + if (addValidationMessagesToResponse) + { + for (Iterator it = messages.iterator(); it.hasNext();) + { + pw.write(LINE_SEPARATOR + (String)it.next()); + } + } + } + catch (Exception e) + { + log.error("Exception while running HealthCheckValve", e); + // if any exceptions occur, even runtime exceptions, simply reset + // the response's buffer and add any messages to it (if required) + try + { + if (!response.isCommitted()) + { + response.resetBuffer(); + } + PrintWriter pw = response.getWriter(); + pw.write(failMessage); + if (addValidationMessagesToResponse) + { + for (Iterator it = messages.iterator(); it.hasNext();) + { + pw.write(LINE_SEPARATOR + (String)it.next()); + } + } + } + catch (Exception e1) + { + log.error("Exception while running HealthCheckValve", e1); + } + } + } +} \ No newline at end of file Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml 2008-07-02 01:15:31 UTC (rev 1003) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/pipelines.xml 2008-07-02 04:21:31 UTC (rev 1004) @@ -378,6 +378,112 @@ + + + + + + + + + + + THE SERVER IS UP + + + + THE SERVER IS DOWN + + + + false + + + + true + + + + + + + + + + + + + + 0 + + + + 0 + + + + + + + + + + + + true + + + + + + + + + + + + + + 0 + + + + 0 + + + + true + + + + true + + + + + + HealthCheckPipeline + + + + + + + + @@ -682,6 +799,9 @@ dtconfigure-pipeline + + healthcheck-pipeline + Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml 2008-07-02 01:15:31 UTC (rev 1003) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/web.xml 2008-07-02 04:21:31 UTC (rev 1004) @@ -219,6 +219,13 @@ /dtconfigure/* --> + + + jetspeed + + /healthcheck/* + + From svnnotify ¡÷ sourceforge.jp Wed Jul 2 13:33:26 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 02 Jul 2008 13:33:26 +0900 Subject: [pal-cvs 3271] [1005] apply patch 'r667496: Minor/ non-intrusive change to make it easier to build a custom' Message-ID: <1214973206.788390.22549.nullmailer@users.sourceforge.jp> Revision: 1005 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1005 Author: sone Date: 2008-07-02 13:33:26 +0900 (Wed, 02 Jul 2008) Log Message: ----------- apply patch 'r667496: Minor/non-intrusive change to make it easier to build a custom' Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/maven-plugin/project.xml -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/maven-plugin/project.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/maven-plugin/project.xml 2008-07-02 04:21:31 UTC (rev 1004) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/maven-plugin/project.xml 2008-07-02 04:33:26 UTC (rev 1005) @@ -71,13 +71,13 @@ org.apache.portals.jetspeed-2 jetspeed-api - 2.1.3 + ${jetspeed.version} jar org.apache.portals.jetspeed-2 jetspeed-deploy-tools - 2.1.3 + ${jetspeed.version} jar From svnnotify ¡÷ sourceforge.jp Wed Jul 2 14:28:09 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 02 Jul 2008 14:28:09 +0900 Subject: [pal-cvs 3272] [1006] apply patch 'r657211: Improve and Test SSO IFrame Portlet' Message-ID: <1214976489.521920.4626.nullmailer@users.sourceforge.jp> Revision: 1006 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1006 Author: sone Date: 2008-07-02 14:28:09 +0900 (Wed, 02 Jul 2008) Log Message: ----------- apply patch 'r657211: Improve and Test SSO IFrame Portlet' Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java 2008-07-02 04:33:26 UTC (rev 1005) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java 2008-07-02 05:28:09 UTC (rev 1006) @@ -1118,10 +1118,11 @@ public SSOSite getSite(String siteUrl) { Criteria filter = new Criteria(); - filter.addEqualTo("url", siteUrl); + filter.addEqualTo("siteUrl", siteUrl); Query query = QueryFactory.newQuery(SSOSiteImpl.class, filter); SSOSite site = (SSOSite) getPersistenceBrokerTemplate() .getObjectByQuery(query); + this.mapSite.put(siteUrl, site); return site; } @@ -1130,7 +1131,7 @@ try { getPersistenceBrokerTemplate().store(site); - this.mapSite.put(site.getName(), site); + this.mapSite.put(site.getSiteURL(), site); } catch (Exception e) { @@ -1166,7 +1167,7 @@ ssoSite.setFormUserField(userField); ssoSite.setFormPwdField(pwdField); getPersistenceBrokerTemplate().store(ssoSite); - this.mapSite.put(siteName, ssoSite); + this.mapSite.put(siteUrl, ssoSite); } catch (Exception e) { @@ -1197,7 +1198,7 @@ ssoSite.setRealm(realm); ssoSite.setChallengeResponseAuthentication(true); getPersistenceBrokerTemplate().store(ssoSite); - this.mapSite.put(siteName, ssoSite); + this.mapSite.put(siteUrl, ssoSite); } catch (Exception e) { @@ -1658,9 +1659,6 @@ // Update database and reset cache try { - getPersistenceBrokerTemplate().store(ssoSite); - - // Persist Principal/Remote getPersistenceBrokerTemplate().store(principal); } catch (Exception e) @@ -1671,4 +1669,14 @@ } } + void debugSite(SSOSite site) + { + Iterator i = site.getRemotePrincipals().iterator(); + while (i.hasNext()) + { + InternalUserPrincipal p = (InternalUserPrincipal) i.next(); + Object o = p.getCredentials().iterator(); + } + } + } From svnnotify ¡÷ sourceforge.jp Wed Jul 2 17:34:41 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 02 Jul 2008 17:34:41 +0900 Subject: [pal-cvs 3273] [1007] Changed repositry.dtd to output correct db-name when using Derby Message-ID: <1214987681.330096.18833.nullmailer@users.sourceforge.jp> Revision: 1007 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1007 Author: sone Date: 2008-07-02 17:34:41 +0900 (Wed, 02 Jul 2008) Log Message: ----------- Changed repositry.dtd to output correct db-name when using Derby Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/etc/db-ojb/repository.dtd -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/etc/db-ojb/repository.dtd =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/etc/db-ojb/repository.dtd 2008-07-02 05:28:09 UTC (rev 1006) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/etc/db-ojb/repository.dtd 2008-07-02 08:34:41 UTC (rev 1007) @@ -142,10 +142,10 @@ Revision: 1008 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1008 Author: sone Date: 2008-07-02 17:38:06 +0900 (Wed, 02 Jul 2008) Log Message: ----------- deleted min-pages Removed Paths: ------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/min-pages/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 3 09:15:15 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 03 Jul 2008 09:15:15 +0900 Subject: [pal-cvs 3275] [1009] bug fixes. Message-ID: <1215044115.992138.27944.nullmailer@users.sourceforge.jp> Revision: 1009 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1009 Author: shinsuke Date: 2008-07-03 09:15:15 +0900 (Thu, 03 Jul 2008) Log Message: ----------- bug fixes. Modified Paths: -------------- announcement/trunk/src/main/java/jp/sf/pal/announcement/dxo/AnnouncementDxo.java announcement/trunk/src/main/java/jp/sf/pal/announcement/filter/AnnouncementFilter.java announcement/trunk/src/main/java/jp/sf/pal/announcement/service/AnnouncementService.java announcement/trunk/src/main/java/jp/sf/pal/announcement/web/edit/EditContentPage.java announcement/trunk/src/main/java/jp/sf/pal/announcement/web/view/DisplayContentPage.java announcement/trunk/src/main/resources/AMMessages.properties announcement/trunk/src/main/resources/appMessages.properties announcement/trunk/src/main/resources/appMessages_ja.properties announcement/trunk/src/main/resources/jp/sf/pal/announcement/web/edit/label.properties announcement/trunk/src/main/resources/jp/sf/pal/announcement/web/edit/label_ja.properties announcement/trunk/src/main/webapp/view/edit/editContent.html Added Paths: ----------- announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstants.java Removed Paths: ------------- announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstraints.java -------------- next part -------------- Added: announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstants.java =================================================================== --- announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstants.java (rev 0) +++ announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstants.java 2008-07-03 00:15:15 UTC (rev 1009) @@ -0,0 +1,23 @@ +package jp.sf.pal.announcement; + +public class AnnouncementConstants { + + public static final String DEFAULT_SCOPE = "DEFAULT"; + + public static final String SCOPE_KEY = "scope"; + + public static final String REPLACE_TITLE_KEY = "replaceTitle"; + + public static final long MIN_DATE = 0; + + public static final long MAX_DATE = 92464556400000L;// 4900/02/01? + + public static final String EDIT_MODE = "edit"; + + public static final String DELETE_MODE = "delete"; + + public static final String UP_MODE = "up"; + + public static final String DOWN_MODE = "down"; + +} Property changes on: announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstants.java ___________________________________________________________________ Name: svn:eol-style + native Deleted: announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstraints.java =================================================================== --- announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstraints.java 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/java/jp/sf/pal/announcement/AnnouncementConstraints.java 2008-07-03 00:15:15 UTC (rev 1009) @@ -1,13 +0,0 @@ -package jp.sf.pal.announcement; - -public class AnnouncementConstraints { - - public static final String DEFAULT_SCOPE = "DEFAULT"; - - public static final String SCOPE_KEY = "scope"; - - public static final long MIN_DATE = 0; - - public static final long MAX_DATE = 92464556400000L;// 4900/02/01? - -} Modified: announcement/trunk/src/main/java/jp/sf/pal/announcement/dxo/AnnouncementDxo.java =================================================================== --- announcement/trunk/src/main/java/jp/sf/pal/announcement/dxo/AnnouncementDxo.java 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/java/jp/sf/pal/announcement/dxo/AnnouncementDxo.java 2008-07-03 00:15:15 UTC (rev 1009) @@ -6,10 +6,13 @@ import jp.sf.pal.announcement.db.exentity.Announcement; import jp.sf.pal.announcement.web.edit.EditContentPage; +import org.seasar.extension.dxo.annotation.ConversionRule; + public interface AnnouncementDxo { public void convertFromAnnouncementToPage(Announcement announcement, EditContentPage page); + @ConversionRule("id : id, title : title, startDate : startDate, endDate : endDate, role : role, content : content") public void convertFromListAnnouncementToListMap( List announcementList, List> list); Modified: announcement/trunk/src/main/java/jp/sf/pal/announcement/filter/AnnouncementFilter.java =================================================================== --- announcement/trunk/src/main/java/jp/sf/pal/announcement/filter/AnnouncementFilter.java 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/java/jp/sf/pal/announcement/filter/AnnouncementFilter.java 2008-07-03 00:15:15 UTC (rev 1009) @@ -8,7 +8,7 @@ import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; -import jp.sf.pal.announcement.AnnouncementConstraints; +import jp.sf.pal.announcement.AnnouncementConstants; import org.apache.portals.bridges.portletfilter.PortletFilter; import org.apache.portals.bridges.portletfilter.PortletFilterChain; @@ -18,12 +18,22 @@ private String scope; + private boolean replaceTitle; + public void init(PortletFilterConfig config) throws PortletException { scope = config.getPortletConfig().getInitParameter( - AnnouncementConstraints.SCOPE_KEY); + AnnouncementConstants.SCOPE_KEY); if (scope == null) { - scope = AnnouncementConstraints.DEFAULT_SCOPE; + scope = AnnouncementConstants.DEFAULT_SCOPE; } + + String value = config.getPortletConfig().getInitParameter( + AnnouncementConstants.REPLACE_TITLE_KEY); + if (value != null && value.equalsIgnoreCase("true")) { + replaceTitle = true; + } else { + replaceTitle = false; + } } public void destroy() { @@ -32,13 +42,21 @@ public void processActionFilter(ActionRequest request, ActionResponse response, PortletFilterChain chain) throws PortletException, IOException { - request.setAttribute(AnnouncementConstraints.SCOPE_KEY, scope); + request.setAttribute(AnnouncementConstants.SCOPE_KEY, scope); + if (replaceTitle) { + request.setAttribute(AnnouncementConstants.REPLACE_TITLE_KEY, + Boolean.TRUE); + } chain.processActionFilter(request, response); } public void renderFilter(RenderRequest request, RenderResponse response, PortletFilterChain chain) throws PortletException, IOException { - request.setAttribute(AnnouncementConstraints.SCOPE_KEY, scope); + request.setAttribute(AnnouncementConstants.SCOPE_KEY, scope); + if (replaceTitle) { + request.setAttribute(AnnouncementConstants.REPLACE_TITLE_KEY, + Boolean.TRUE); + } chain.renderFilter(request, response); } Modified: announcement/trunk/src/main/java/jp/sf/pal/announcement/service/AnnouncementService.java =================================================================== --- announcement/trunk/src/main/java/jp/sf/pal/announcement/service/AnnouncementService.java 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/java/jp/sf/pal/announcement/service/AnnouncementService.java 2008-07-03 00:15:15 UTC (rev 1009) @@ -7,7 +7,8 @@ import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import jp.sf.pal.announcement.AnnouncementConstraints; +import jp.sf.pal.announcement.AnnouncementConstants; +import jp.sf.pal.announcement.db.cbean.AnnouncementBodyCB; import jp.sf.pal.announcement.db.cbean.AnnouncementCB; import jp.sf.pal.announcement.db.exbhv.AnnouncementBhv; import jp.sf.pal.announcement.db.exbhv.AnnouncementBodyBhv; @@ -59,7 +60,25 @@ } public void deleteAnnouncement(Announcement announcement) { + AnnouncementBody announcementBody = announcement + .getAnnouncementBodyAsOne(); + if (announcementBody == null) { + Integer id = announcement.getId(); + AnnouncementBodyCB cb = new AnnouncementBodyCB(); + cb.query().setId_Equal(id); + announcementBody = announcementBodyBhv.selectEntity(cb); + } announcementBhv.delete(announcement); + announcementBodyBhv.delete(announcementBody); + + // update sortOrder + List announcementList = getAnnouncementList(); + int sortOrder = announcementList.size(); + for (Announcement am : announcementList) { + am.setSortOrder(sortOrder); + announcementBhv.createOrModify(am); + sortOrder--; + } } public List getAnnouncementList() { @@ -69,16 +88,58 @@ return announcementBhv.selectList(cb); } + public void moveUpAnnouncement(Announcement announcement) { + int id = announcement.getId().intValue(); + List announcementList = getAnnouncementList(); + int i = 0; + for (Announcement am : announcementList) { + if (am.getId().intValue() == id) { + // throw RuntimeException + announcementList.add(i - 1, announcementList.remove(i)); + break; + } + i++; + } + + int sortOrder = announcementList.size(); + for (Announcement am : announcementList) { + am.setSortOrder(sortOrder); + announcementBhv.createOrModify(am); + sortOrder--; + } + } + + public void moveDownAnnouncement(Announcement announcement) { + int id = announcement.getId().intValue(); + List announcementList = getAnnouncementList(); + int i = 0; + for (Announcement am : announcementList) { + if (am.getId().intValue() == id) { + // throw RuntimeException + announcementList.add(i + 1, announcementList.remove(i)); + break; + } + i++; + } + + int sortOrder = announcementList.size(); + for (Announcement am : announcementList) { + am.setSortOrder(sortOrder); + announcementBhv.createOrModify(am); + sortOrder--; + } + } + public void createAnnouncement(Announcement announcement) { // prepare announcement.setScope(getScope()); if (announcement.getStartDate() == null) { announcement.setStartDate(new Timestamp( - AnnouncementConstraints.MIN_DATE)); + AnnouncementConstants.MIN_DATE)); } if (announcement.getEndDate() == null) { announcement.setEndDate(new Timestamp( - AnnouncementConstraints.MAX_DATE)); + AnnouncementConstants.MAX_DATE)); } List announcementList = getAnnouncementList(); @@ -100,13 +161,22 @@ } public void updateAnnouncement(Announcement announcement) { + if (announcement.getStartDate() == null) { + announcement.setStartDate(new Timestamp( + AnnouncementConstants.MIN_DATE)); + } + if (announcement.getEndDate() == null) { + announcement.setEndDate(new Timestamp( + AnnouncementConstants.MAX_DATE)); + } + announcementBhv.update(announcement); announcementBodyBhv.update(announcement.getAnnouncementBodyAsOne()); } private String getScope() { return (String) FacesContext.getCurrentInstance().getExternalContext() - .getRequestMap().get(AnnouncementConstraints.SCOPE_KEY); + .getRequestMap().get(AnnouncementConstants.SCOPE_KEY); } private Announcement getDefaultAnnouncement() { Modified: announcement/trunk/src/main/java/jp/sf/pal/announcement/web/edit/EditContentPage.java =================================================================== --- announcement/trunk/src/main/java/jp/sf/pal/announcement/web/edit/EditContentPage.java 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/java/jp/sf/pal/announcement/web/edit/EditContentPage.java 2008-07-03 00:15:15 UTC (rev 1009) @@ -9,7 +9,7 @@ import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import jp.sf.pal.announcement.AnnouncementConstraints; +import jp.sf.pal.announcement.AnnouncementConstants; import jp.sf.pal.announcement.db.exentity.Announcement; import jp.sf.pal.announcement.db.exentity.AnnouncementBody; import jp.sf.pal.announcement.dxo.AnnouncementDxo; @@ -31,26 +31,28 @@ private static final Logger logger = Logger .getLogger(EditContentPage.class); - public String mode; - public Integer id; - @Required + @Required(target = "doFinishSave") public String title; - @DateTimeConverter(pattern = "yyyy/MM/dd") + @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm") public Date startDate; - @DateTimeConverter(pattern = "yyyy/MM/dd") + @DateTimeConverter(pattern = "yyyy/MM/dd HH:mm") public Date endDate; public String role; - @Required + @Required(target = "doFinishSave") public String content; public List> announcementItems; + public int announcementIndex; + + public int announcementMaxCount; + private AnnouncementService announcementService; private AnnouncementDxo announcementDxo; @@ -69,26 +71,9 @@ new Object[] { id }); logger.log("EAM0001", new Object[] { id }); } else { - if ("delete".equals(mode)) { - //delete - try { - announcementService.deleteAnnouncement(announcement); - FacesMessageUtil.addInfoMessage("deleted.announcement", - new Object[] { id }); - if (logger.isInfoEnabled()) { - logger.log("IAM0001", new Object[] { id }); - } - } catch (Exception e) { - FacesMessageUtil.addErrorMessage( - "failed.to.delete.announcement", - new Object[] { id }); - logger.log("EAM0002", new Object[] { id }, e); - } - } else { - // edit mode - announcementDxo.convertFromAnnouncementToPage(announcement, - this); - } + // edit mode + announcementDxo.convertFromAnnouncementToPage(announcement, + this); } } @@ -99,10 +84,126 @@ announcementDxo.convertFromListAnnouncementToListMap(announcementList, announcementItems); + announcementMaxCount = announcementItems.size(); + FacesMessageUtil.renderMessages(); return null; } + public Class doMoveUp() { + Integer targetId = getTargetId(); + if (targetId == null) { + return null; + } + Announcement announcement = announcementService + .getAnnouncement(targetId); + if (announcement == null) { + FacesMessageUtil.addErrorMessage("could.not.find.announcement", + new Object[] { targetId }); + logger.log("EAM0001", new Object[] { targetId }); + } else { + // up + try { + announcementService.moveUpAnnouncement(announcement); + FacesMessageUtil.addInfoMessage("moved.announcement.up", + new Object[] { targetId }); + if (logger.isInfoEnabled()) { + logger.log("IAM0005", new Object[] { targetId }); + } + return EditContentPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage( + "failed.to.move.announcement.up", + new Object[] { targetId }); + logger.log("EAM0007", new Object[] { targetId }, e); + } + } + return null; + } + + public Class doMoveDown() { + Integer targetId = getTargetId(); + if (targetId == null) { + return null; + } + Announcement announcement = announcementService + .getAnnouncement(targetId); + if (announcement == null) { + FacesMessageUtil.addErrorMessage("could.not.find.announcement", + new Object[] { targetId }); + logger.log("EAM0001", new Object[] { targetId }); + } else { + // down + try { + announcementService.moveDownAnnouncement(announcement); + FacesMessageUtil.addInfoMessage("moved.announcement.down", + new Object[] { targetId }); + if (logger.isInfoEnabled()) { + logger.log("IAM0004", new Object[] { targetId }); + } + return EditContentPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage( + "failed.to.move.announcement.up", new Object[] { id }); + logger.log("EAM0006", new Object[] { targetId }, e); + } + } + return null; + } + + public Class doEdit() { + Integer targetId = getTargetId(); + if (targetId == null) { + return null; + } + + id = targetId; + return EditContentPage.class; + } + + public Class doFinishDelete() { + Integer targetId = getTargetId(); + if (targetId == null) { + return null; + } + Announcement announcement = announcementService + .getAnnouncement(targetId); + if (announcement == null) { + FacesMessageUtil.addErrorMessage("could.not.find.announcement", + new Object[] { targetId }); + logger.log("EAM0001", new Object[] { targetId }); + } else { + //delete + try { + announcementService.deleteAnnouncement(announcement); + FacesMessageUtil.addInfoMessage("deleted.announcement", + new Object[] { targetId }); + if (logger.isInfoEnabled()) { + logger.log("IAM0001", new Object[] { targetId }); + } + return EditContentPage.class; + } catch (Exception e) { + FacesMessageUtil.addErrorMessage( + "failed.to.delete.announcement", + new Object[] { targetId }); + logger.log("EAM0002", new Object[] { targetId }, e); + } + } + return null; + } + + protected Integer getTargetId() { + Map targetObject = (Map) announcementItems + .get(announcementIndex); + if (targetObject == null) { + FacesMessageUtil + .addErrorMessage("could.not.find.announcement.list"); + logger.log("EAM0008", null); + return null; + } + return (Integer) targetObject.get("id"); + } + public Class doFinishCreateNew() { return EditContentPage.class; } @@ -222,7 +323,7 @@ public Date getStartDate() { if (startDate != null - && startDate.getTime() <= AnnouncementConstraints.MIN_DATE) { + && startDate.getTime() <= AnnouncementConstants.MIN_DATE) { return null; } return startDate; @@ -230,7 +331,7 @@ public Date getEndDate() { if (endDate != null - && endDate.getTime() >= AnnouncementConstraints.MAX_DATE) { + && endDate.getTime() >= AnnouncementConstants.MAX_DATE) { return null; } return endDate; @@ -248,4 +349,32 @@ return labelHelper.getLabelValue("new"); } + public String getDoMoveUpValue() { + return labelHelper.getLabelValue("up"); + } + + public String getDoMoveDownValue() { + return labelHelper.getLabelValue("down"); + } + + public String getDoEditValue() { + return labelHelper.getLabelValue("edit"); + } + + public String getDoFinishDeleteValue() { + return labelHelper.getLabelValue("delete"); + } + + public int getPriority() { + return announcementIndex + 1; + } + + public boolean isMoveDown() { + return announcementIndex < announcementMaxCount - 1 + && announcementMaxCount > 1; + } + + public boolean isMoveUp() { + return announcementIndex > 0 && announcementMaxCount > 1; + } } Modified: announcement/trunk/src/main/java/jp/sf/pal/announcement/web/view/DisplayContentPage.java =================================================================== --- announcement/trunk/src/main/java/jp/sf/pal/announcement/web/view/DisplayContentPage.java 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/java/jp/sf/pal/announcement/web/view/DisplayContentPage.java 2008-07-03 00:15:15 UTC (rev 1009) @@ -2,9 +2,11 @@ import java.io.Serializable; -import javax.portlet.PortletResponse; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; import javax.portlet.RenderResponse; +import jp.sf.pal.announcement.AnnouncementConstants; import jp.sf.pal.announcement.db.exentity.Announcement; import jp.sf.pal.announcement.service.AnnouncementService; import jp.sf.pal.common.util.FacesMessageUtil; @@ -17,7 +19,7 @@ private AnnouncementService announcementService; - private PortletResponse response; + // private PortletResponse response; public Class initialize() { return null; @@ -27,9 +29,18 @@ Announcement announcement = announcementService .getCurrentAvailableAnnouncement(); content = announcement.getAnnouncementBodyAsOne().getContent(); - if (response instanceof RenderResponse) { - ((RenderResponse) response).setTitle(announcement.getTitle()); + + //TODO needs to fix s2 + ExternalContext externalContext = FacesContext.getCurrentInstance() + .getExternalContext(); + if (externalContext.getRequestMap().get( + AnnouncementConstants.REPLACE_TITLE_KEY) != null) { + Object response = externalContext.getResponse(); + if (response instanceof RenderResponse) { + ((RenderResponse) response).setTitle(announcement.getTitle()); + } } + FacesMessageUtil.renderMessages(); return null; } @@ -42,12 +53,4 @@ this.announcementService = announcementService; } - public PortletResponse getResponse() { - return response; - } - - public void setResponse(PortletResponse response) { - this.response = response; - } - } Modified: announcement/trunk/src/main/resources/AMMessages.properties =================================================================== --- announcement/trunk/src/main/resources/AMMessages.properties 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/resources/AMMessages.properties 2008-07-03 00:15:15 UTC (rev 1009) @@ -3,8 +3,13 @@ EAM0003=Could not find the announcement(id={0}). EAM0004=Failed to create the announcement. EAM0005=Failed to update the announcement(id={0}). +EAM0006=Failed to move the announcement(id={0}) down. +EAM0007=Failed to move the announcement(id={0}) up. +EAM0008=Could not find the announcement. IAM0001=Deleted announcement({0}). IAM0002=Created announcement. IAM0003=Updated announcement({0}). +IAM0004=Moved announcement({0}) down. +IAM0005=Moved announcement({0}) up. Modified: announcement/trunk/src/main/resources/appMessages.properties =================================================================== --- announcement/trunk/src/main/resources/appMessages.properties 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/resources/appMessages.properties 2008-07-03 00:15:15 UTC (rev 1009) @@ -5,3 +5,8 @@ failed.to.create.announcement=Failed to create an announcement. If you see this error again, please contact to a site administrator. updated.announcement=Updated announcement(id={0}). failed.to.update.announcement=Failed to update the announcement(id={0}). If you see this error again, please contact to a site administrator. +moved.announcement.down=Moved announcement(id={0}) down. +failed.to.move.announcement.down=Failed to move the announcement(id={0}) down. If you see this error again, please contact to a site administrator. +moved.announcement.up=Moved announcement(id={0}) up. +failed.to.move.announcement.up=Failed to move the announcement(id={0}) up. If you see this error again, please contact to a site administrator. +could.not.find.announcement.list=Could not find the annnouncement. If you see this error again, please contact to a site administrator. Modified: announcement/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- announcement/trunk/src/main/resources/appMessages_ja.properties 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/resources/appMessages_ja.properties 2008-07-03 00:15:15 UTC (rev 1009) @@ -5,3 +5,8 @@ failed.to.create.announcement=\u304a\u77e5\u3089\u305b\u60c5\u5831\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u3053\u306e\u30a8\u30e9\u30fc\u304c\u8868\u793a\u3055\u308c\u308b\u5834\u5408\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 updated.announcement=\u304a\u77e5\u3089\u305b\u60c5\u5831(id={0})\u3092\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002 failed.to.update.announcement=\u304a\u77e5\u3089\u305b\u60c5\u5831(id={0})\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u3053\u306e\u30a8\u30e9\u30fc\u304c\u8868\u793a\u3055\u308c\u308b\u5834\u5408\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +moved.announcement.down=\u304a\u77e5\u3089\u305b\u60c5\u5831(id={0})\u3092\u4e0b\u306b\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002 +failed.to.move.announcement.down=\u304a\u77e5\u3089\u305b\u60c5\u5831(id={0})\u3092\u4e0b\u306b\u79fb\u52d5\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u3053\u306e\u30a8\u30e9\u30fc\u304c\u8868\u793a\u3055\u308c\u308b\u5834\u5408\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +moved.announcement.up=\u304a\u77e5\u3089\u305b\u60c5\u5831(id={0})\u3092\u4e0a\u306b\u79fb\u52d5\u3057\u307e\u3057\u305f\u3002 +failed.to.move.announcement.up=\u304a\u77e5\u3089\u305b\u60c5\u5831(id={0})\u3092\u4e0a\u306b\u79fb\u52d5\u3059\u308b\u306e\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u518d\u5ea6\u3001\u3053\u306e\u30a8\u30e9\u30fc\u304c\u8868\u793a\u3055\u308c\u308b\u5834\u5408\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 +could.not.find.announcement.list=\u304a\u77e5\u3089\u305b\u60c5\u5831\u3092\u898b\u3064\u3051\u3089\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u3053\u306e\u30a8\u30e9\u30fc\u304c\u8868\u793a\u3055\u308c\u308b\u5834\u5408\u306f\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 Modified: announcement/trunk/src/main/resources/jp/sf/pal/announcement/web/edit/label.properties =================================================================== --- announcement/trunk/src/main/resources/jp/sf/pal/announcement/web/edit/label.properties 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/resources/jp/sf/pal/announcement/web/edit/label.properties 2008-07-03 00:15:15 UTC (rev 1009) @@ -8,12 +8,18 @@ releaseDateInput=Release Date: roleInput=Role: +dateFormatExample=(ex. 2008/02/03 12:30) + +listPriority=Priority listTitle=Title listStartDate=Start Date listEndDate=End Date listRole=Role +listOrder=Order listAction=Action +up=Up +down=Down edit=Edit delete=Delete new=New Modified: announcement/trunk/src/main/resources/jp/sf/pal/announcement/web/edit/label_ja.properties =================================================================== --- announcement/trunk/src/main/resources/jp/sf/pal/announcement/web/edit/label_ja.properties 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/resources/jp/sf/pal/announcement/web/edit/label_ja.properties 2008-07-03 00:15:15 UTC (rev 1009) @@ -8,12 +8,18 @@ releaseDateInput=\u516c\u958b\u65e5: roleInput=\u30ed\u30fc\u30eb: +dateFormatExample=(ex. 2008/02/03 12:30) + +listPriority=\u512a\u5148\u5ea6 listTitle=\u30bf\u30a4\u30c8\u30eb listStartDate=\u958b\u59cb\u65e5 listEndDate=\u7d42\u4e86\u65e5 listRole=\u30ed\u30fc\u30eb +listOrder=\u9806\u5e8f listAction=\u51e6\u7406 +up=\u4e0a\u3078 +down=\u4e0b\u3078 edit=\u7de8\u96c6 delete=\u524a\u9664 new=\u30ea\u30bb\u30c3\u30c8 Modified: announcement/trunk/src/main/webapp/view/edit/editContent.html =================================================================== --- announcement/trunk/src/main/webapp/view/edit/editContent.html 2008-07-02 08:38:06 UTC (rev 1008) +++ announcement/trunk/src/main/webapp/view/edit/editContent.html 2008-07-03 00:15:15 UTC (rev 1009) @@ -6,8 +6,8 @@ +
-
@@ -18,9 +18,10 @@

- + - - + +

@@ -42,27 +43,39 @@

+
+
+ + + + + + From svnnotify ¡÷ sourceforge.jp Sat Jul 5 08:19:03 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Sat, 05 Jul 2008 08:19:03 +0900 Subject: [pal-cvs 3276] [1010] fixed a multi-thread problem. Message-ID: <1215213543.077159.20595.nullmailer@users.sourceforge.jp> Revision: 1010 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1010 Author: shinsuke Date: 2008-07-05 08:19:02 +0900 (Sat, 05 Jul 2008) Log Message: ----------- fixed a multi-thread problem. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java 2008-07-03 00:15:15 UTC (rev 1009) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java 2008-07-04 23:19:02 UTC (rev 1010) @@ -111,7 +111,7 @@ { if ((constraintsDefsList != null) && (constraintsDefsMap == null)) { - constraintsDefsMap = new HashMap( + Map constraintsDefsMap = new HashMap( (constraintsDefsList.size() * 2) + 1); Iterator definitionsIter = constraintsDefsList.iterator(); while (definitionsIter.hasNext()) @@ -120,6 +120,7 @@ .next(); constraintsDefsMap.put(definition.getName(), definition); } + this.constraintsDefsMap = constraintsDefsMap; } if (constraintsDefsMap != null) { return (SecurityConstraintsDef) constraintsDefsMap .get(name); } From svnnotify ¡÷ sourceforge.jp Mon Jul 7 08:11:44 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 08:11:44 +0900 Subject: [pal-cvs 3277] [1011] fixed incorrect synchronized object. Message-ID: <1215385904.262970.10742.nullmailer@users.sourceforge.jp> Revision: 1011 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1011 Author: shinsuke Date: 2008-07-07 08:11:43 +0900 (Mon, 07 Jul 2008) Log Message: ----------- fixed incorrect synchronized object. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java 2008-07-04 23:19:02 UTC (rev 1010) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCache.java 2008-07-06 23:11:43 UTC (rev 1011) @@ -406,10 +406,8 @@ try { int count = 0; - Collection values = Collections - .synchronizedCollection(FileCache.this.cache - .values()); - synchronized (values) + Collection values = FileCache.this.cache.values(); + synchronized (cache) // TODO check a performance { for (Iterator it = values.iterator(); it.hasNext();) { From svnnotify ¡÷ sourceforge.jp Mon Jul 7 08:58:06 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 08:58:06 +0900 Subject: [pal-cvs 3278] [1012] 1.2 snapshot. Message-ID: <1215388686.419330.14980.nullmailer@users.sourceforge.jp> Revision: 1012 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1012 Author: shinsuke Date: 2008-07-07 08:58:06 +0900 (Mon, 07 Jul 2008) Log Message: ----------- 1.2 snapshot. Modified Paths: -------------- pal-admin/trunk/pom.xml -------------- next part -------------- Modified: pal-admin/trunk/pom.xml =================================================================== --- pal-admin/trunk/pom.xml 2008-07-06 23:11:43 UTC (rev 1011) +++ pal-admin/trunk/pom.xml 2008-07-06 23:58:06 UTC (rev 1012) @@ -3,7 +3,7 @@ 4.0.0jp.sf.palpal-admin - 1.1 + 1.2-SNAPSHOTwarAdministration tools for PAL Portal From svnnotify ¡÷ sourceforge.jp Mon Jul 7 09:06:31 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 09:06:31 +0900 Subject: [pal-cvs 3279] [1013] supported - Message-ID: <1215389191.532757.21289.nullmailer@users.sourceforge.jp> Revision: 1013 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1013 Author: shinsuke Date: 2008-07-07 09:06:31 +0900 (Mon, 07 Jul 2008) Log Message: ----------- supported - Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java 2008-07-06 23:58:06 UTC (rev 1012) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java 2008-07-07 00:06:31 UTC (rev 1013) @@ -114,7 +114,7 @@ @Override @Required @Length(maximum = 32) - @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ¡÷ _]+") + @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ¡÷ _-]+") public void setName(String name) { super.setName(name); } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java 2008-07-06 23:58:06 UTC (rev 1012) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java 2008-07-07 00:06:31 UTC (rev 1013) @@ -108,7 +108,7 @@ @Override @Required - @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ¡÷ _]+") + @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ¡÷ _-]+") @Length(maximum = 32) public void setName(String name) { super.setName(name); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java 2008-07-06 23:58:06 UTC (rev 1012) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java 2008-07-07 00:06:31 UTC (rev 1013) @@ -67,7 +67,7 @@ @Override @Required - @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ¡÷ _]+") + @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ¡÷ _-]+") @Length(maximum = 32) public void setName(String name) { super.setName(name); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java 2008-07-06 23:58:06 UTC (rev 1012) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java 2008-07-07 00:06:31 UTC (rev 1013) @@ -62,7 +62,7 @@ @Override @Required @Length(maximum = 32) - @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ¡÷ _]+") + @RegularExpression(pattern = "[\\p{Alpha}\\p{Digit}\',. ¡÷ _-]+") public void setName(String name) { super.setName(name); } From svnnotify ¡÷ sourceforge.jp Mon Jul 7 13:35:37 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 13:35:37 +0900 Subject: [pal-cvs 3280] [1014] added debug log. Message-ID: <1215405337.116494.7772.nullmailer@users.sourceforge.jp> Revision: 1014 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1014 Author: shinsuke Date: 2008-07-07 13:35:36 +0900 (Mon, 07 Jul 2008) Log Message: ----------- added debug log. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java 2008-07-07 00:06:31 UTC (rev 1013) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/PortletDeploymentService.java 2008-07-07 04:35:36 UTC (rev 1014) @@ -39,6 +39,7 @@ import jp.sf.pal.admin.web.deployer.RemotePortletDeployConfirmPage; import jp.sf.pal.admin.web.deployer.RemotePortletListPage; +import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.util.UploadedFile; public class PortletDeploymentService implements Serializable { @@ -47,6 +48,12 @@ */ private static final long serialVersionUID = 1801379304226762028L; + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(PortletDeploymentService.class); + private PortletDeploymentLogic portletDeploymentLogic; private PortletManagementLogic portletManagementLogic; @@ -152,6 +159,13 @@ + localFile.getAbsolutePath()); pa.setPackaging(getExtension(uploadedFile.getName())); + if (logger.isDebugEnabled()) { + logger.debug("name=" + name); + logger.debug("localFile.getAbsolutePath()=" + + localFile.getAbsolutePath()); + logger.debug("uploadedFile.getName()=" + uploadedFile.getName()); + } + portletDeploymentLogic.deploy(pa); } From svnnotify ¡÷ sourceforge.jp Mon Jul 7 13:38:27 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 13:38:27 +0900 Subject: [pal-cvs 3281] [1015] modified logging. Message-ID: <1215405507.444075.10306.nullmailer@users.sourceforge.jp> Revision: 1015 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1015 Author: shinsuke Date: 2008-07-07 13:38:27 +0900 (Mon, 07 Jul 2008) Log Message: ----------- modified logging. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/AbstractRuleCriterionPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/AbstractGlobalSecurityConstraintPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderOrderEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutAddPortletEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageSecurityEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java pal-admin/trunk/src/main/resources/PAMessages.properties pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/resources/appMessages_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/DeployerEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -22,14 +22,19 @@ import jp.sf.pal.admin.web.AbstractCrudPage; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.util.LabelHelper; import org.seasar.teeda.extension.util.UploadedFile; public class DeployerEditPage extends AbstractCrudPage implements Serializable { + + private static final long serialVersionUID = -1591324603578689328L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = -1591324603578689328L; + private static final Logger logger = Logger + .getLogger(DeployerEditPage.class); // @Required private transient UploadedFile portletApplicationFile; @@ -87,9 +92,10 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.start.portlet.application.deployment"); + logger.log("EPA0168", null, e); } } else { - FacesMessageUtil.addErrorMessage("invalid.upload.file"); + FacesMessageUtil.addWarnMessage("invalid.upload.file"); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletDeployConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -17,21 +17,25 @@ import java.io.Serializable; -import org.seasar.teeda.extension.util.LabelHelper; - import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.PortletDeploymentService; import jp.sf.pal.admin.web.AbstractCrudPage; import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.util.LabelHelper; + public class RemotePortletDeployConfirmPage extends AbstractCrudPage implements Serializable { + private static final long serialVersionUID = -2270772566560001373L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = -2270772566560001373L; + private static final Logger logger = Logger + .getLogger(RemotePortletDeployConfirmPage.class); private String artifactId; @@ -121,6 +125,8 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.start.portlet.application.deployment"); + logger.log("EPA0169", new Object[] { getGroupId(), + getArtifactId(), getVersion(), getPackaging() }, e); } } return RemotePortletListPage.class; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemotePortletListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class RemotePortletListPage extends AbstractPagerPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -109222720193261550L; private String publisherName; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -15,18 +15,30 @@ */ package jp.sf.pal.admin.web.deployer; +import java.io.Serializable; + import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.RepositoryManagementService; import jp.sf.pal.admin.web.AbstractCrudPage; import jp.sf.pal.admin.web.CrudType; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; import org.seasar.teeda.extension.util.LabelHelper; -public class RemoteRepositoryConfirmPage extends AbstractCrudPage { +public class RemoteRepositoryConfirmPage extends AbstractCrudPage implements + Serializable { + private static final long serialVersionUID = -9059482570471139265L; + + /** + * Logger for this class + */ + private static final Logger logger = Logger + .getLogger(RemoteRepositoryConfirmPage.class); + private String name; private String configPath; @@ -93,6 +105,7 @@ public Class doFinish() { if (getName() == null) { FacesMessageUtil.addWarnMessage("invalid.repository.parameters"); + logger.log("EPA0170", null); return RemoteRepositoryListPage.class; } @@ -104,6 +117,7 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.add.new.repository"); + logger.log("EPA0171", null, e); } break; case CrudType.UPDATE: @@ -112,6 +126,7 @@ FacesMessageUtil.addInfoMessage("updated.repository"); } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.update.repository"); + logger.log("EPA0172", null, e); } break; case CrudType.DELETE: @@ -120,6 +135,7 @@ FacesMessageUtil.addInfoMessage("deleted.repository"); } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.delete.repository"); + logger.log("EPA0173", null, e); } break; default: Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/deployer/RemoteRepositoryEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -17,19 +17,23 @@ import java.io.Serializable; -import org.seasar.teeda.extension.util.LabelHelper; - import jp.sf.pal.admin.service.RepositoryManagementService; import jp.sf.pal.admin.web.AbstractCrudPage; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.util.LabelHelper; + public class RemoteRepositoryEditPage extends AbstractCrudPage implements Serializable { + private static final long serialVersionUID = -5296937640583502536L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = -5296937640583502536L; + private static final Logger logger = Logger + .getLogger(RemoteRepositoryEditPage.class); private String name; @@ -93,6 +97,7 @@ if (getName() == null) { FacesMessageUtil .addErrorMessage("invalid.repository.parameters"); + logger.log("EPA0174", null); return RemoteRepositoryListPage.class; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -27,9 +27,6 @@ public class GroupConfirmPage extends AbstractGroupPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -283173697251156241L; /** @@ -58,7 +55,7 @@ } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.add.new.group", new Object[] { getName() }); - logger.error("Failed to add a new group: " + getName(), e); + logger.log("EPA0160", new Object[] { getName() }, e); } break; // case CrudType.UPDATE: @@ -71,7 +68,7 @@ } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.delete.group", new Object[] { getName() }); - logger.error("Failed to delete a new group: " + getName(), e); + logger.log("EPA0161", new Object[] { getName() }, e); } break; default: Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -17,16 +17,13 @@ import java.io.Serializable; +import jp.sf.pal.common.util.FacesMessageUtil; + import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.Required; -import jp.sf.pal.common.util.FacesMessageUtil; - public class GroupEditPage extends AbstractGroupPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 666316850285389222L; public String initialize() { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/group/GroupListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -23,12 +23,16 @@ import jp.sf.pal.admin.web.AbstractPagerPage; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; + public class GroupListPage extends AbstractPagerPage implements Serializable { + private static final long serialVersionUID = 2827788757965933167L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = 2827788757965933167L; + private static final Logger logger = Logger.getLogger(GroupListPage.class); private int groupIndex; @@ -82,7 +86,12 @@ } public String prerender() { - getGroupManagementService().loadPage(this); + try { + getGroupManagementService().loadPage(this); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.get.groups"); + logger.log("EPA0162", null, e); + } // render FacesMessages FacesMessageUtil.renderMessages(); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/password/PasswordEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class PasswordEditPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 8299805833656409820L; /** @@ -71,8 +68,8 @@ try { username = getPasswordManagementService().getUsername(); } catch (CommonException e) { - logger.log("EPA0047", new Object[] {}, e); FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0047", new Object[] {}, e); } if (username == null) { @@ -82,6 +79,7 @@ if (!getPasswordManagementService().validate(username, currentPassword, newPassword)) { FacesMessageUtil.addErrorMessage("invalid.new.password"); + logger.log("EPA0167", null); return null; } @@ -90,8 +88,8 @@ currentPassword, newPassword); FacesMessageUtil.addInfoMessage("changed.password"); } catch (CommonException e) { - logger.log("EPA0046", new Object[] {}, e); FacesMessageUtil.addErrorMessage(e.getMessageId()); + logger.log("EPA0046", new Object[] {}, e); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/AbstractPermissionPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -15,11 +15,11 @@ */ package jp.sf.pal.admin.web.permission; -import org.seasar.teeda.extension.util.LabelHelper; - import jp.sf.pal.admin.service.PermissionManagementService; import jp.sf.pal.admin.web.AbstractCrudPage; +import org.seasar.teeda.extension.util.LabelHelper; + public abstract class AbstractPermissionPage extends AbstractCrudPage { private String name; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class FolderPermissionConfirmPage extends AbstractPermissionPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 9023563142910966532L; /** @@ -51,9 +48,9 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0036", e); FacesMessageUtil .addErrorMessage("could.not.find.folder.permission"); + logger.log("EPA0036", null, e); } } else { if (isUpdate()) { @@ -76,9 +73,9 @@ FacesMessageUtil.addInfoMessage("added.folder.permission"); return FolderPermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0037", e); FacesMessageUtil .addErrorMessage("could.not.add.folder.permission"); + logger.log("EPA0037", null, e); } } else if (isUpdate()) { // update @@ -87,9 +84,9 @@ FacesMessageUtil.addInfoMessage("updated.folder.permission"); return FolderPermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0038", e); FacesMessageUtil .addErrorMessage("could.not.update.folder.permission"); + logger.log("EPA0038", null, e); } } else if (isDelete()) { // delete @@ -98,12 +95,14 @@ FacesMessageUtil.addInfoMessage("deleted.folder.permission"); return FolderPermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0039", e); FacesMessageUtil .addErrorMessage("could.not.delete.folder.permission"); + logger.log("EPA0039", null, e); } } else { FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + logger.log("WPA0023", + new Object[] { Integer.valueOf(getCrudType()) }); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class FolderPermissionEditPage extends AbstractPermissionPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -4575207464231801908L; /** @@ -56,9 +53,9 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0035", e); FacesMessageUtil .addErrorMessage("could.not.find.folder.permission"); + logger.log("EPA0035", null, e); } // render faces message Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/FolderPermissionListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class FolderPermissionListPage extends AbstractPagerPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 2457037062742678960L; /** @@ -61,9 +58,9 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0034", e); FacesMessageUtil .addErrorMessage("could.not.find.folder.permissions"); + logger.log("EPA0034", null, e); } // render faces message Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class PagePermissionConfirmPage extends AbstractPermissionPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 525599648048090961L; /** @@ -51,9 +48,9 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0042", e); FacesMessageUtil .addErrorMessage("could.not.find.page.permission"); + logger.log("EPA0042", null, e); } } else { if (isUpdate()) { @@ -76,9 +73,9 @@ FacesMessageUtil.addInfoMessage("added.page.permission"); return PagePermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0043", e); FacesMessageUtil .addErrorMessage("could.not.add.page.permission"); + logger.log("EPA0043", null, e); } } else if (isUpdate()) { // update @@ -87,9 +84,9 @@ FacesMessageUtil.addInfoMessage("updated.page.permission"); return PagePermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0044", e); FacesMessageUtil .addErrorMessage("could.not.update.page.permission"); + logger.log("EPA0044", null, e); } } else if (isDelete()) { // delete @@ -98,12 +95,14 @@ FacesMessageUtil.addInfoMessage("deleted.page.permission"); return PagePermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0045", e); FacesMessageUtil .addErrorMessage("could.not.delete.page.permission"); + logger.log("EPA0045", null, e); } } else { FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + logger.log("WPA0024", + new Object[] { Integer.valueOf(getCrudType()) }); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class PagePermissionEditPage extends AbstractPermissionPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -6276578931150134498L; /** @@ -56,8 +53,8 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0041", e); FacesMessageUtil.addErrorMessage("could.not.find.page.permission"); + logger.log("EPA0041", null, e); } // render faces message Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PagePermissionListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class PagePermissionListPage extends AbstractPagerPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -5318877226955302854L; /** @@ -61,8 +58,8 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0024", e); FacesMessageUtil.addErrorMessage("could.not.find.page.permissions"); + logger.log("EPA0024", null, e); } // render faces message Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class PortletPermissionConfirmPage extends AbstractPermissionPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 7198440443223185603L; /** @@ -51,9 +48,9 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0030", e); FacesMessageUtil .addErrorMessage("could.not.find.portlet.permission"); + logger.log("EPA0030", null, e); } } else { if (isUpdate()) { @@ -76,9 +73,9 @@ FacesMessageUtil.addInfoMessage("added.portlet.permission"); return PortletPermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0031", e); FacesMessageUtil .addErrorMessage("could.not.add.portlet.permission"); + logger.log("EPA0031", null, e); } } else if (isUpdate()) { // update @@ -87,9 +84,9 @@ FacesMessageUtil.addInfoMessage("updated.portlet.permission"); return PortletPermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0032", e); FacesMessageUtil .addErrorMessage("could.not.update.portlet.permission"); + logger.log("EPA0032", null, e); } } else if (isDelete()) { // delete @@ -98,12 +95,14 @@ FacesMessageUtil.addInfoMessage("deleted.portlet.permission"); return PortletPermissionListPage.class; } catch (PALAdminException e) { - logger.error("EPA0033", e); FacesMessageUtil .addErrorMessage("could.not.delete.portlet.permission"); + logger.log("EPA0033", null, e); } } else { FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + logger.log("WPA0025", + new Object[] { Integer.valueOf(getCrudType()) }); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class PortletPermissionEditPage extends AbstractPermissionPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 2408447311367739937L; /** @@ -56,9 +53,9 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0029", e); FacesMessageUtil .addErrorMessage("could.not.find.portlet.permission"); + logger.log("EPA0029", null, e); } // render faces message Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/permission/PortletPermissionListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class PortletPermissionListPage extends AbstractPagerPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -3454682306082731012L; /** @@ -61,9 +58,9 @@ try { getPermissionManagementService().loadPage(this); } catch (PALAdminException e) { - logger.error("EPA0028", e); FacesMessageUtil .addErrorMessage("could.not.find.portlet.permissions"); + logger.log("EPA0028", null, e); } // render faces message Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletActionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -17,21 +17,25 @@ import java.io.Serializable; -import org.seasar.teeda.extension.util.LabelHelper; - import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.PortletManagementService; import jp.sf.pal.admin.web.AbstractCrudPage; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; +import org.seasar.teeda.extension.util.LabelHelper; + public class PortletActionConfirmPage extends AbstractCrudPage implements Serializable { + private static final long serialVersionUID = -9103369009857828750L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = -9103369009857828750L; + private static final Logger logger = Logger + .getLogger(PortletActionConfirmPage.class); private String name; @@ -103,6 +107,7 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.start.portlet.application"); + logger.log("EPA0163", new Object[] { getName() }, e); } } else if (isStopAction()) { try { @@ -111,6 +116,7 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.stop.portlet.application"); + logger.log("EPA0164", new Object[] { getName() }, e); } } else if (isUndeployAction()) { try { @@ -120,6 +126,7 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.undeploy.portlet.application"); + logger.log("EPA0165", new Object[] { getName() }, e); } } else if (isDeleteAction()) { try { @@ -128,10 +135,13 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.delete.portlet.application"); + logger.log("EPA0166", new Object[] { getName() }, e); } } else { FacesMessageUtil .addWarnMessage("invalid.action.for.portlet.application"); + logger.log("WPA0022", null); + return null; } return PortletListPage.class; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/portletmanager/PortletListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -26,9 +26,6 @@ public class PortletListPage extends AbstractPagerPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -4766951315413321520L; private String name; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/AbstractRuleCriterionPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/AbstractRuleCriterionPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/AbstractRuleCriterionPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -1,10 +1,10 @@ package jp.sf.pal.admin.web.profiler; -import org.seasar.teeda.extension.util.LabelHelper; - import jp.sf.pal.admin.service.ProfilingRuleService; import jp.sf.pal.admin.web.AbstractCrudPage; +import org.seasar.teeda.extension.util.LabelHelper; + public class AbstractRuleCriterionPage extends AbstractCrudPage { private Integer fallbackOrder; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -30,7 +30,7 @@ getProfilingRuleService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0065", e); + logger.log("EPA0065", null, e); } } else { // update or create @@ -61,7 +61,7 @@ return RuleListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0066", e); + logger.log("EPA0066", null, e); } } else if (isUpdate()) { // update @@ -71,7 +71,7 @@ return RuleListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0067", e); + logger.log("EPA0067", null, e); } } else if (isDelete()) { // delete @@ -81,10 +81,11 @@ return RuleListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0068", e); + logger.log("EPA0068", null, e); } } else { FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + logger.log("WPA0020", null); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -2,6 +2,10 @@ import java.io.Serializable; +import jp.sf.pal.admin.util.PALAdminUtil; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.takeover.TakeOver; import org.seasar.teeda.extension.annotation.takeover.TakeOverType; @@ -9,10 +13,6 @@ import org.seasar.teeda.extension.annotation.validator.RegularExpression; import org.seasar.teeda.extension.annotation.validator.Required; -import jp.sf.pal.admin.util.PALAdminUtil; -import jp.sf.pal.common.CommonException; -import jp.sf.pal.common.util.FacesMessageUtil; - public class RuleCriterionConfirmPage extends AbstractRuleCriterionPage implements Serializable { @@ -34,7 +34,7 @@ getProfilingRuleService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0070", e); + logger.log("EPA0070", null, e); } } else { // update or create @@ -66,7 +66,7 @@ return RuleCriterionListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0071", e); + logger.log("EPA0071", null, e); } } else if (isUpdate()) { // update @@ -76,7 +76,7 @@ return RuleCriterionListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0072", e); + logger.log("EPA0072", null, e); } } else if (isDelete()) { // delete @@ -86,10 +86,11 @@ return RuleCriterionListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0073", e); + logger.log("EPA0073", null, e); } } else { FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + logger.log("WPA0021", null); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -4,14 +4,14 @@ import java.util.List; import java.util.Map; +import jp.sf.pal.common.CommonException; +import jp.sf.pal.common.util.FacesMessageUtil; + import org.seasar.framework.log.Logger; import org.seasar.teeda.extension.annotation.validator.Length; import org.seasar.teeda.extension.annotation.validator.RegularExpression; import org.seasar.teeda.extension.annotation.validator.Required; -import jp.sf.pal.common.CommonException; -import jp.sf.pal.common.util.FacesMessageUtil; - public class RuleCriterionEditPage extends AbstractRuleCriterionPage implements Serializable { @@ -37,7 +37,7 @@ getProfilingRuleService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0064", e); + logger.log("EPA0064", null, e); } // render faces messages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleCriterionListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -4,13 +4,13 @@ import java.util.List; import java.util.Map; -import org.seasar.framework.log.Logger; - import jp.sf.pal.admin.service.ProfilingRuleService; import jp.sf.pal.admin.web.AbstractPagerPage; import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; + public class RuleCriterionListPage extends AbstractPagerPage implements Serializable { @@ -47,7 +47,7 @@ getProfilingRuleService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0069", e); + logger.log("EPA0069", null, e); } // render faces messages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -33,7 +33,7 @@ getProfilingRuleService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0064", e); + logger.log("EPA0064", null, e); } // render faces messages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/profiler/RuleListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -37,7 +37,7 @@ getProfilingRuleService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0048", e); + logger.log("EPA0048", null, e); } // render faces messages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/ForgottenPasswordPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -19,17 +19,14 @@ import javax.faces.context.FacesContext; -import org.seasar.framework.log.Logger; - import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; + public class ForgottenPasswordPage extends AbstractForgottenPasswordPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -1002535740755952748L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -17,18 +17,16 @@ import java.io.Serializable; -import org.seasar.framework.log.Logger; - import jp.sf.pal.admin.PALAdminConstants; import jp.sf.pal.admin.util.UserRegistrationUtil; import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; + public class UserRegistrationPage extends AbstractUserRegistrationPage implements Serializable { - /** - * - */ + private static final long serialVersionUID = -5852964123222268945L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -26,9 +26,7 @@ import org.seasar.teeda.extension.annotation.validator.Required; public class RoleConfirmPage extends AbstractRolePage implements Serializable { - /** - * - */ + private static final long serialVersionUID = 8565809646908671454L; /** @@ -57,7 +55,7 @@ } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.add.new.role", new Object[] { getName() }); - logger.error("Failed to add a new role: " + getName(), e); + logger.log("EPA0158", new Object[] { getName() }, e); } break; // case CrudType.UPDATE: @@ -70,7 +68,7 @@ } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.delete.role", new Object[] { getName() }); - logger.error("Failed to delete a new role: " + getName(), e); + logger.log("EPA0159", new Object[] { getName() }, e); } break; default: Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -24,9 +24,6 @@ public class RoleEditPage extends AbstractRolePage implements Serializable { - /** - * - */ private static final long serialVersionUID = 8348278121674992785L; public String initialize() { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/role/RoleListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -23,12 +23,16 @@ import jp.sf.pal.admin.web.AbstractPagerPage; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; + public class RoleListPage extends AbstractPagerPage implements Serializable { + private static final long serialVersionUID = -9134524940073547390L; + /** - * + * Logger for this class */ - private static final long serialVersionUID = -9134524940073547390L; + private static final Logger logger = Logger.getLogger(RoleListPage.class); private int roleIndex; @@ -99,7 +103,12 @@ } public String prerender() { - roleManagementService.loadPage(this); + try { + roleManagementService.loadPage(this); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.get.roles"); + logger.log("EPA0157", null, e); + } // render FacesMessages FacesMessageUtil.renderMessages(); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/AbstractGlobalSecurityConstraintPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/AbstractGlobalSecurityConstraintPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/AbstractGlobalSecurityConstraintPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -1,10 +1,10 @@ package jp.sf.pal.admin.web.securityconstraint; -import org.seasar.teeda.extension.util.LabelHelper; - import jp.sf.pal.admin.service.SecurityConstraintService; import jp.sf.pal.admin.web.AbstractCrudPage; +import org.seasar.teeda.extension.util.LabelHelper; + public class AbstractGlobalSecurityConstraintPage extends AbstractCrudPage { private String name; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -28,7 +28,7 @@ getSecurityConstraintService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0060", e); + logger.log("EPA0060", null, e); } } else { // update or create @@ -61,7 +61,7 @@ return GlobalSecurityConstraintListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0061", e); + logger.log("EPA0061", null, e); } } else if (isUpdate()) { // update @@ -84,10 +84,12 @@ return GlobalSecurityConstraintListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0063", e); + logger.log("EPA0063", null, e); } } else { FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + logger.log("WPA0018", + new Object[] { Integer.valueOf(getCrudType()) }); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -27,7 +27,7 @@ getSecurityConstraintService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0049", e); + logger.log("EPA0049", null, e); } // render faces messages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/GlobalSecurityConstraintListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -4,13 +4,13 @@ import java.util.List; import java.util.Map; -import org.seasar.framework.log.Logger; - import jp.sf.pal.admin.service.SecurityConstraintService; import jp.sf.pal.admin.web.AbstractPagerPage; import jp.sf.pal.common.CommonException; import jp.sf.pal.common.util.FacesMessageUtil; +import org.seasar.framework.log.Logger; + public class GlobalSecurityConstraintListPage extends AbstractPagerPage implements Serializable { @@ -39,7 +39,7 @@ getSecurityConstraintService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0059", e); + logger.log("EPA0059", null, e); } // render faces messages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,7 +29,7 @@ getSecurityConstraintService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0050", e); + logger.log("EPA0050", null, e); } } else { // update or create @@ -60,7 +60,7 @@ return SecurityDefinitionListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0051", e); + logger.log("EPA0051", null, e); } } else if (isUpdate()) { // update @@ -81,10 +81,12 @@ return SecurityDefinitionListPage.class; } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0053", e); + logger.log("EPA0053", null, e); } } else { FacesMessageUtil.addWarnMessage("could.not.find.target.action"); + logger.log("WPA0019", + new Object[] { Integer.valueOf(getCrudType()) }); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionConstraintListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -72,7 +72,7 @@ getSecurityConstraintService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0054"); + logger.log("EPA0054", null); } // render FacesMessages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -33,8 +33,7 @@ getSecurityConstraintService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0049", e); - + logger.log("EPA0049", null, e); } // render faces messages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/securityconstraint/SecurityDefinitionListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -39,7 +39,7 @@ getSecurityConstraintService().loadPage(this); } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); - logger.error("EPA0048", e); + logger.log("EPA0048", null, e); } // render faces messages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -33,16 +33,13 @@ public class FolderAddFolderAndPageEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 7554996409131145939L; /** * Logger for this class */ private static final Logger logger = Logger - .getLogger(FolderInfoEditorPage.class); + .getLogger(FolderAddFolderAndPageEditorPage.class); @Required private String layoutName; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -32,9 +32,6 @@ public class FolderInfoEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 7317388711533222091L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderMetadataEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -32,9 +32,6 @@ public class FolderMetadataEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 7467441597149052725L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderOrderEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderOrderEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderOrderEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -31,9 +31,6 @@ public class FolderOrderEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -6925976356083695370L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderSecurityEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class FolderSecurityEditorPage extends AbstractSiteSecurityEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -8992530845130742843L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutAddPortletEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutAddPortletEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutAddPortletEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -30,16 +30,13 @@ public class LayoutAddPortletEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 7303037331858505917L; /** * Logger for this class */ private static final Logger logger = Logger - .getLogger(LayoutInfoEditorPage.class); + .getLogger(LayoutAddPortletEditorPage.class); private String layoutName; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -31,9 +31,6 @@ public class LayoutInfoEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -7707159453322242563L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -34,9 +34,6 @@ public class LayoutPreferenceEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 8040353172823831504L; /** @@ -93,6 +90,7 @@ doDelete(); } else { FacesMessageUtil.addWarnMessage("could.not.find.preference"); + logger.log("WPA0013", null); } setPreferenceName(null); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -33,9 +33,6 @@ public class LayoutPropertyEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -7433703093804486330L; /** @@ -92,6 +89,7 @@ doDelete(); } else { FacesMessageUtil.addWarnMessage("could.not.find.property"); + logger.log("WPA0014", null); } setPropertyName(null); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -32,9 +32,6 @@ public class PageInfoEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 6200363396293790793L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageMetadataEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -32,9 +32,6 @@ public class PageMetadataEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 7467441597149052725L; /** @@ -239,6 +236,7 @@ doDelete(); } else { FacesMessageUtil.addWarnMessage("could.not.find.metadata"); + logger.log("WPA0015", null); } setMetadataLocale(null); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageSecurityEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageSecurityEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageSecurityEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,6 @@ public class PageSecurityEditorPage extends AbstractSiteSecurityEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 5074641483347337061L; /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -31,16 +31,13 @@ public class PortletInfoEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -5933118337604397635L; /** * Logger for this class */ private static final Logger logger = Logger - .getLogger(LayoutInfoEditorPage.class); + .getLogger(PortletInfoEditorPage.class); private String decorator; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -34,9 +34,6 @@ public class PortletPreferenceEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = -3291082572720400440L; /** @@ -93,6 +90,7 @@ doDelete(); } else { FacesMessageUtil.addWarnMessage("could.not.find.preference"); + logger.log("WPA0016", null); } setPreferenceName(null); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -33,9 +33,6 @@ public class PortletPropertyEditorPage extends AbstractSiteEditorPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 1628021934053317733L; /** @@ -92,6 +89,7 @@ doDelete(); } else { FacesMessageUtil.addWarnMessage("could.not.find.property"); + logger.log("WPA0017", null); } setPropertyName(null); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/AbstractUserAttributePage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -15,11 +15,11 @@ */ package jp.sf.pal.admin.web.user; -import org.seasar.teeda.extension.util.LabelHelper; - import jp.sf.pal.admin.service.UserManagementService; import jp.sf.pal.admin.web.AbstractCrudPage; +import org.seasar.teeda.extension.util.LabelHelper; + public abstract class AbstractUserAttributePage extends AbstractCrudPage { private String name; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -30,9 +30,6 @@ public class UserAttributeConfirmPage extends AbstractUserAttributePage implements Serializable { - /** - * - */ private static final long serialVersionUID = 8059029609744518426L; /** @@ -54,8 +51,7 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.get.userattributes"); - logger.error("Failed to get user attributes: " + getName(), - e); + logger.log("EPA0141", new Object[] { getName() }, e); } } else { setCrudType(CrudType.READ); @@ -81,8 +77,7 @@ FacesMessageUtil.addErrorMessage( "failed.to.add.new.userattribute", new Object[] { getKey() }); - logger.error("Failed to add a new user attribute: " + getKey(), - e); + logger.log("EPA0142", new Object[] { getKey() }, e); } break; case CrudType.UPDATE: @@ -94,8 +89,7 @@ FacesMessageUtil.addErrorMessage( "failed.to.update.new.userattribute", new Object[] { getKey() }); - logger.error("Failed to update a new user attribute: " + getKey(), - e); + logger.log("EPA0143", new Object[] { getKey() }, e); } break; case CrudType.DELETE: @@ -107,8 +101,7 @@ FacesMessageUtil.addErrorMessage( "failed.to.delete.userattribute", new Object[] { getKey() }); - logger.error("Failed to delete a new user attribute: " - + getKey(), e); + logger.log("EPA0144", new Object[] { getKey() }, e); } break; default: Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -28,9 +28,6 @@ public class UserAttributeEditPage extends AbstractUserAttributePage implements Serializable { - /** - * - */ private static final long serialVersionUID = -6429222904388985538L; /** @@ -52,8 +49,7 @@ } catch (PALAdminException e) { FacesMessageUtil .addErrorMessage("failed.to.get.userattributes"); - logger.error("Failed to get user attributes: " + getName(), - e); + logger.log("EPA0145", new Object[] { getName() }, e); } } else { setCrudType(CrudType.CREATE); Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -32,9 +32,6 @@ public class UserAttributeListPage extends AbstractPagerPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 8042231097969101982L; /** @@ -134,7 +131,7 @@ getUserManagementService().loadPage(this); } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.get.userattributes"); - logger.error("Failed to get user attributes: " + getName(), e); + logger.log("EPA0146", new Object[] { getName() }, e); } // render FacesMessages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserConfirmPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,7 @@ import org.seasar.teeda.extension.annotation.takeover.TakeOver; public class UserConfirmPage extends AbstractUserPage implements Serializable { - /** - * - */ + private static final long serialVersionUID = 5950243264539560661L; /** @@ -83,11 +81,11 @@ } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId(), new Object[] { getName() }); - logger.error("Failed to add a new user: " + getName(), e); + logger.log("EPA0147", new Object[] { getName() }, e); } catch (Exception e) { FacesMessageUtil.addErrorMessage("failed.to.add.new.user", new Object[] { getName() }); - logger.error("Failed to add a new user: " + getName(), e); + logger.log("EPA0148", new Object[] { getName() }, e); } } @@ -97,7 +95,8 @@ && getName().equals( FacesContext.getCurrentInstance().getExternalContext() .getRemoteUser())) { - FacesMessageUtil.addErrorMessage("cannot.delete.current.user"); + FacesMessageUtil.addWarnMessage("cannot.delete.current.user"); + logger.log("WPA0001", null); return; } @@ -108,7 +107,7 @@ } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.delete.user", new Object[] { getName() }); - logger.error("Failed to delete the user: " + getName(), e); + logger.log("EPA0149", new Object[] { getName() }, e); } } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserCreatePage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -29,9 +29,7 @@ import org.seasar.teeda.extension.annotation.validator.Required; public class UserCreatePage extends AbstractUserPage implements Serializable { - /** - * - */ + private static final long serialVersionUID = 4251184998427709566L; private List> roleNameItems; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -30,9 +30,7 @@ import org.seasar.teeda.extension.util.LabelHelper; public class UserEditPage extends AbstractCrudPage implements Serializable { - /** - * - */ + private static final long serialVersionUID = 8197167663670294677L; /** @@ -181,6 +179,7 @@ if (!getUserManagementService().isUserExists(getName())) { FacesMessageUtil.addWarnMessage("could.not.find.user", new Object[] { getName() }); + logger.log("WPA0002", new Object[] { getName() }); return UserListPage.class; } @@ -195,7 +194,8 @@ public Class doUpdate() { // check password if (getPassword() == null && getPasswordConfirm() != null) { - FacesMessageUtil.addErrorMessage("confirm.password.does.not.match"); + FacesMessageUtil.addWarnMessage("confirm.password.does.not.match"); + logger.log("WPA0003", new Object[] { getName() }); return null; } @@ -207,7 +207,7 @@ FacesMessageUtil.addErrorMessage( "failed.to.update.user.information", new Object[] { getName() }); - logger.error("Failed to update the user: " + getName(), e); + logger.log("WPA0004", new Object[] { getName() }, e); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserGroupEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -30,9 +30,7 @@ import org.seasar.teeda.extension.util.LabelHelper; public class UserGroupEditPage extends AbstractCrudPage implements Serializable { - /** - * - */ + private static final long serialVersionUID = 1292537289932760208L; /** @@ -163,6 +161,7 @@ public Class doAddGroup() { if (getName() == null || getNewGroup() == null) { FacesMessageUtil.addWarnMessage("invalid.group.or.user.name"); + logger.log("WPA0005", new Object[] { getName(), getNewGroup() }); return null; } @@ -171,6 +170,7 @@ getNewGroup())) { FacesMessageUtil.addWarnMessage("group.exists.in.user", new Object[] { getName(), getNewGroup() }); + logger.log("WPA0006", new Object[] { getName(), getNewGroup() }); return null; } @@ -184,8 +184,7 @@ } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.add.group.to.user", new Object[] { getName(), getNewGroup() }); - logger.error("Failed to add group to user. user=" + getName() - + ", group=" + getNewGroup(), e); + logger.log("EPA0150", new Object[] { getName(), getNewGroup() }, e); } return null; } @@ -193,6 +192,7 @@ public Class doRemoveGroup() { if (getGroups() == null || getGroups().length == 0) { FacesMessageUtil.addWarnMessage("need.to.select.groups"); + logger.log("WPA0007", new Object[] { getGroups() }); return null; } @@ -208,8 +208,8 @@ FacesMessageUtil.addErrorMessage( "failed.to.remove.groups.from.user", new Object[] { getName(), getGroups() }); - logger.error("Failed to remove groups from user. user=" + getName() - + ", groups=" + StringUtils.join(getGroups()), e); + logger.log("EPA0151", + new Object[] { StringUtils.join(getGroups()) }, e); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -22,7 +22,6 @@ import java.util.Map; import jp.sf.pal.admin.PALAdminConstants; -import jp.sf.pal.admin.PALAdminException; import jp.sf.pal.admin.service.UserManagementService; import jp.sf.pal.admin.web.AbstractPagerPage; import jp.sf.pal.common.util.FacesMessageUtil; @@ -33,9 +32,6 @@ public class UserListPage extends AbstractPagerPage implements Serializable { - /** - * - */ private static final long serialVersionUID = 1803281059596051705L; /** @@ -127,9 +123,9 @@ public String prerender() { try { userManagementService.loadPage(this); - } catch (PALAdminException e) { - FacesMessageUtil.addErrorMessage("failed.to.get.users"); - logger.error("Failed to get users: " + getName(), e); + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("failed.to.get.roles"); + logger.log("EPA0152", null, e); } // render FacesMessages Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserProfilingRuleEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -33,9 +33,7 @@ public class UserProfilingRuleEditPage extends AbstractCrudPage implements Serializable { - /** - * - */ + private static final long serialVersionUID = -863022117977960622L; /** @@ -203,6 +201,8 @@ || getNewProfilingRuleName() == null) { FacesMessageUtil .addWarnMessage("invalid.profilingRule.or.user.name"); + logger.log("WPA0008", new Object[] { getName(), + getNewProfilingRuleName(), getNewLocatorName() }); return null; } @@ -220,9 +220,8 @@ "failed.to.add.principalRule.to.user", new Object[] { getName(), getNewLocatorName(), getNewProfilingRuleName() }); - logger.error("Failed to add principalRule to user. user=" - + getName() + ", principalRule=" + getNewLocatorName() - + "/" + getNewProfilingRuleName(), e); + logger.log("EPA0153", new Object[] { getName(), + getNewLocatorName(), getNewProfilingRuleName() }, e); } return null; } @@ -230,6 +229,7 @@ public Class doRemoveProfilingRule() { if (getPrincipalRules() == null || getPrincipalRules().length == 0) { FacesMessageUtil.addWarnMessage("need.to.select.profiling.rules"); + logger.log("WPA0009", new Object[] { getPrincipalRules() }); return null; } @@ -253,9 +253,8 @@ getName(), PALAdminUtil .toStringFromArray(parsePrincipalRules(getPrincipalRules())) }); - logger.error("Failed to remove principalRules from user. user=" - + getName() + ", principalRules=" - + StringUtils.join(getPrincipalRules()), e); + logger.log("EPA0154", new Object[] { getName(), + StringUtils.join(getPrincipalRules()) }, e); } return null; } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserRoleEditPage.java 2008-07-07 04:38:27 UTC (rev 1015) @@ -30,16 +30,14 @@ import org.seasar.teeda.extension.util.LabelHelper; public class UserRoleEditPage extends AbstractCrudPage implements Serializable { - /** - * - */ + private static final long serialVersionUID = 3675965027344869490L; /** * Logger for this class */ private static final Logger logger = Logger - .getLogger(UserGroupEditPage.class); + .getLogger(UserRoleEditPage.class); private LabelHelper labelHelper; @@ -154,6 +152,7 @@ public String doAddRole() { if (getName() == null || getNewRole() == null) { FacesMessageUtil.addWarnMessage("invalid.role.or.user.name"); + logger.log("WPA0010", new Object[] { getName(), getNewRole() }); return null; } @@ -162,6 +161,7 @@ getNewRole())) { FacesMessageUtil.addWarnMessage("role.exists.in.user", new Object[] { getName(), getNewRole() }); + logger.log("WPA0011", new Object[] { getName(), getNewRole() }); return null; } @@ -175,8 +175,7 @@ } catch (PALAdminException e) { FacesMessageUtil.addErrorMessage("failed.to.add.role.to.user", new Object[] { getName(), getNewRole() }); - logger.error("Failed to add role to user. user=" + getName() - + ", role=" + getNewRole(), e); + logger.log("EPA0155", new Object[] { getName(), getNewRole() }, e); } return null; } @@ -184,6 +183,7 @@ public String doRemoveRole() { if (getRoles() == null || getRoles().length == 0) { FacesMessageUtil.addWarnMessage("need.to.select.roles"); + logger.log("WPA0012", new Object[] { getRoles() }); return null; } @@ -199,8 +199,8 @@ FacesMessageUtil.addErrorMessage( "failed.to.remove.roles.from.user", new Object[] { getName(), getRoles() }); - logger.error("Failed to remove roles from user. user=" + getName() - + ", roles=" + StringUtils.join(getRoles()), e); + logger.log("EPA0156", new Object[] { getName(), + StringUtils.join(getRoles()) }, e); } return null; } Modified: pal-admin/trunk/src/main/resources/PAMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/PAMessages.properties 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/resources/PAMessages.properties 2008-07-07 04:38:27 UTC (rev 1015) @@ -5,7 +5,6 @@ EPA0005=Could not load a user info. EPA0006=Could not load a order. EPA0007=Could not change a order. - EPA0008=Could not load a page. EPA0009=Could not add a property. EPA0010=Could not add a property. @@ -72,7 +71,6 @@ EPA0071=Could not add a rule criterion. EPA0072=Could not update a rule criterion. EPA0073=Could not delete a rule criterion. - EPA0074=Could not load a page. EPA0075=Could not update a page. EPA0076=Could not update a page. @@ -140,5 +138,63 @@ EPA0138=Could not update a portlet. EPA0139=Could not delete a portlet. EPA0140=Could not delete a portlet. +EPA0141=Failed to get user attributes: {0} +EPA0142=Failed to add a new user attribute: {0} +EPA0143=Failed to update a new user attribute: {0} +EPA0144=Failed to delete a new user attribute: {0} +EPA0145=Failed to get user attributes: {0} +EPA0146=Failed to get user attributes: {0} +EPA0147=Failed to add a new user: {0} +EPA0148=Failed to add a new user: {0} +EPA0149=Failed to delete the user: {0} +EPA0150=Failed to add group to user. user={0}, group={1} +EPA0151=Failed to remove groups from user. user={0}, groups={1} +EPA0152=Failed to get users. +EPA0153=Failed to add principalRule to user. user={0}, principalRule={1}/{2} +EPA0154=Failed to remove principalRules from user. user={0}, principalRules={1} +EPA0155=Failed to add role to user. user={0}, role={1} +EPA0156=Failed to remove roles from user. user={0}, roles={1} +EPA0157=Failed to get roles. +EPA0158=Failed to add a new role: {0} +EPA0159=Failed to delete a new role: {0} +EPA0160=Failed to add a new group: {0} +EPA0161=Failed to delete a new group: {0} +EPA0162=Failed to get groups. +EPA0163=Failed to start a portlet application: {0} +EPA0164=Failed to stop a portlet application: {0} +EPA0165=Failed to undeploy a portlet application: {0} +EPA0166=Failed to delete a portlet application: {0} +EPA0167=Invalid new password. +EPA0168=Failed to start a portlet application deployment. +EPA0169=Failed to start a portlet application deployment: {0}, {1}, {2}, {3} +EPA0170=Invalid repository parameters. +EPA0171=Failed to add new repository. +EPA0172=Failed to update new repository. +EPA0173=Failed to delete new repository. +EPA0174=Invalid repository parameters. - +WPA0001=Failed to delete a user. The username is null. +WPA0002=Could not find a user: {0} +WPA0003=The confirm password does not match: {0} +WPA0004=Failed to update the user: {0} +WPA0005=Invalid user name or group: name={0}, group={1} +WPA0006=The group already exists in the user: {0}, group={1} +WPA0007=Invalid groups: {0} +WPA0008=Invalid user name or profiling rule: name={0}, rule={1}, locator={2} +WPA0009=Invalid rule: {0} +WPA0010=Invalid username or role: name={0}, role={1} +WPA0011=The role already exists in the user: name={0}, role={1} +WPA0012=Invalid roles: {0} +WPA0013=Could not find a preference. +WPA0014=Could not find a property. +WPA0015=Could not find a metadata. +WPA0016=Could not find a preference. +WPA0017=Could not find a property. +WPA0018=Could not find a target action: {0} +WPA0019=Could not find a target action: {0} +WPA0020=Could not find a target action: {0} +WPA0021=Could not find a target action: {0} +WPA0022=Could not find a target action: {0} +WPA0023=Could not find a target action: {0} +WPA0024=Could not find a target action: {0} +WPA0025=Could not find a target action: {0} Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2008-07-07 04:38:27 UTC (rev 1015) @@ -298,3 +298,5 @@ rule.criterion.already.exists=The rule criterion already exists. rule.criterion.does.not.exist=The rule criterion does not exist. +failed.to.get.roles=Failed to get roles. +failed.to.get.groups=Failed to get groups. Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-07-07 04:35:36 UTC (rev 1014) +++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-07-07 04:38:27 UTC (rev 1015) @@ -276,3 +276,6 @@ could.not.delete.global.security.constraint=\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u3092\u524a\u9664\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u518d\u5ea6\u3001\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3059\u308b\u5834\u5408\u306f\u3001\u7ba1\u7406\u8005\u306b\u304a\u554f\u3044\u5408\u308f\u305b\u304f\u3060\u3055\u3044\u3002 global.security.constraint.already.exists=\u305d\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u3059\u3002 global.security.constraint.does.not.exist=\u305d\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u305b\u3093\u3002 + +failed.to.get.roles=\u30ed\u30fc\u30eb\u60c5\u5831\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +failed.to.get.groups=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \ No newline at end of file From svnnotify ¡÷ sourceforge.jp Mon Jul 7 14:00:01 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 14:00:01 +0900 Subject: [pal-cvs 3282] [1016] catch a runtime exception. Message-ID: <1215406801.389105.26190.nullmailer@users.sourceforge.jp> Revision: 1016 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1016 Author: shinsuke Date: 2008-07-07 14:00:01 +0900 (Mon, 07 Jul 2008) Log Message: ----------- catch a runtime exception. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java pal-admin/trunk/src/main/resources/PAMessages.properties pal-admin/trunk/src/main/resources/appMessages.properties pal-admin/trunk/src/main/resources/appMessages_ja.properties -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2008-07-07 04:38:27 UTC (rev 1015) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/registration/UserRegistrationPage.java 2008-07-07 05:00:01 UTC (rev 1016) @@ -59,7 +59,9 @@ } catch (CommonException e) { FacesMessageUtil.addErrorMessage(e.getMessageId()); logger.log("EPA0001", new Object[] { this.toString() }, e); - + } catch (Exception e) { + FacesMessageUtil.addErrorMessage("could.not.create.user"); + logger.log("EPA0175", new Object[] { getUserName() }, e); } return null; Modified: pal-admin/trunk/src/main/resources/PAMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/PAMessages.properties 2008-07-07 04:38:27 UTC (rev 1015) +++ pal-admin/trunk/src/main/resources/PAMessages.properties 2008-07-07 05:00:01 UTC (rev 1016) @@ -172,6 +172,7 @@ EPA0172=Failed to update new repository. EPA0173=Failed to delete new repository. EPA0174=Invalid repository parameters. +EPA0175=Could not create user: {0} WPA0001=Failed to delete a user. The username is null. WPA0002=Could not find a user: {0} Modified: pal-admin/trunk/src/main/resources/appMessages.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages.properties 2008-07-07 04:38:27 UTC (rev 1015) +++ pal-admin/trunk/src/main/resources/appMessages.properties 2008-07-07 05:00:01 UTC (rev 1016) @@ -300,3 +300,4 @@ failed.to.get.roles=Failed to get roles. failed.to.get.groups=Failed to get groups. +could.not.create.user=Could not create a user. Modified: pal-admin/trunk/src/main/resources/appMessages_ja.properties =================================================================== --- pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-07-07 04:38:27 UTC (rev 1015) +++ pal-admin/trunk/src/main/resources/appMessages_ja.properties 2008-07-07 05:00:01 UTC (rev 1016) @@ -278,4 +278,5 @@ global.security.constraint.does.not.exist=\u305d\u306e\u30b0\u30ed\u30fc\u30d0\u30eb\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u5236\u7d04\u306f\u5b58\u5728\u3057\u3066\u3044\u307e\u305b\u3093\u3002 failed.to.get.roles=\u30ed\u30fc\u30eb\u60c5\u5831\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 -failed.to.get.groups=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 \ No newline at end of file +failed.to.get.groups=\u30b0\u30eb\u30fc\u30d7\u60c5\u5831\u306e\u53d6\u5f97\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +could.not.create.user=\u30e6\u30fc\u30b6\u30fc\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 From svnnotify ¡÷ sourceforge.jp Mon Jul 7 15:33:35 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 07 Jul 2008 15:33:35 +0900 Subject: [pal-cvs 3283] [1017] added default profiling rule. Message-ID: <1215412415.554603.5461.nullmailer@users.sourceforge.jp> Revision: 1017 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1017 Author: shinsuke Date: 2008-07-07 15:33:35 +0900 (Mon, 07 Jul 2008) Log Message: ----------- added default profiling rule. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/profiler.xml -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-07-07 05:00:01 UTC (rev 1016) +++ pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-07-07 06:33:35 UTC (rev 1017) @@ -20,7 +20,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - + application/xhtml+xml @@ -298,10 +298,6 @@ user site siteadmin - @@ -332,26 +328,6 @@ - site,siteadmin @@ -379,12 +355,6 @@ - - - admin - - - user @@ -449,6 +419,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/profiler.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/profiler.xml 2008-07-07 05:00:01 UTC (rev 1016) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/assembly/profiler.xml 2008-07-07 06:33:35 UTC (rev 1017) @@ -23,7 +23,7 @@ JETSPEED-INF/ojb/profiler_repository.xml - j2 + default From svnnotify ¡÷ sourceforge.jp Tue Jul 8 10:02:08 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 08 Jul 2008 10:02:08 +0900 Subject: [pal-cvs 3284] [1018] remove an old preference value by setting a new one. Message-ID: <1215478928.678031.30327.nullmailer@users.sourceforge.jp> Revision: 1018 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1018 Author: shinsuke Date: 2008-07-08 10:02:08 +0900 (Tue, 08 Jul 2008) Log Message: ----------- remove an old preference value by setting a new one. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java Added Paths: ----------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareCollection.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareList.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml 2008-07-07 06:33:35 UTC (rev 1017) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml 2008-07-08 01:02:08 UTC (rev 1018) @@ -1793,6 +1793,7 @@ Revision: 1019 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1019 Author: shinsuke Date: 2008-07-08 17:24:06 +0900 (Tue, 08 Jul 2008) Log Message: ----------- remove an old preference value by setting a new one. Modified Paths: -------------- pal-portal/tags/pal-portal-1.0.5/portal/jetspeed-2/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml pal-portal/tags/pal-portal-1.0.5/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java Added Paths: ----------- pal-portal/tags/pal-portal-1.0.5/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/ pal-portal/tags/pal-portal-1.0.5/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareCollection.java pal-portal/tags/pal-portal-1.0.5/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareList.java -------------- next part -------------- Modified: pal-portal/tags/pal-portal-1.0.5/portal/jetspeed-2/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml =================================================================== --- pal-portal/tags/pal-portal-1.0.5/portal/jetspeed-2/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml 2008-07-08 01:02:08 UTC (rev 1018) +++ pal-portal/tags/pal-portal-1.0.5/portal/jetspeed-2/components/page-manager/src/java/JETSPEED-INF/ojb/page-manager-repository.xml 2008-07-08 08:24:06 UTC (rev 1019) @@ -1793,6 +1793,7 @@ Revision: 1020 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1020 Author: sone Date: 2008-07-09 19:14:13 +0900 (Wed, 09 Jul 2008) Log Message: ----------- Findbug 'DONE' Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/container/ContainerConstants.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/BaseObjectProxy.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/components/BaseMockComponent.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobQueue.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/administration/AdminUtil.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeInformationImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/namespace/JetspeedNamespaceMapperImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/HybridNavigationalState.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/simpleregistry/Entry.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserListAction.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/resource/BufferedHttpServletResponse.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/cluster/TestCluster.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuElementImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PersistenceBrokerPreferencesProvider.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/SwingParserAdaptor.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/xml/SaxParserAdaptor.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapGroupSecurityHandler.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapUserSecurityHandler.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/util/ResourceBundleFactory.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/container/ContainerConstants.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/container/ContainerConstants.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/container/ContainerConstants.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -41,9 +41,15 @@ public final static String PORTLET_NAME = "org.apache.jetspeed.portlet.name"; - public final static Integer METHOD_RENDER = new Integer(1); + // DONE Findbugs + // public final static Integer METHOD_RENDER = new Integer(1); + public final static Integer METHOD_RENDER = Integer.valueOf(1); - public final static Integer METHOD_ACTION = new Integer(3); + // DONE Findbugs + // public final static Integer METHOD_ACTION = new Integer(3); + public final static Integer METHOD_ACTION = Integer.valueOf(3); - public final static Integer METHOD_NOOP = new Integer(5); + // DONE Findbugs + // public final static Integer METHOD_NOOP = new Integer(5); + public final static Integer METHOD_NOOP = Integer.valueOf(5); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/portlets/layout/ColumnLayout.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -127,7 +127,9 @@ for (int i = 0; i < numberOfColumns; i++) { - columns.put(new Integer(i), new TreeMap()); + // DONE Findbugs + // columns.put(new Integer(i), new TreeMap()); + columns.put(Integer.valueOf(i), new TreeMap()); } nextRowNumber = new int[numberOfColumns]; @@ -194,11 +196,10 @@ *

*
    *
  • Fragments without a row defined are placed at the bottom of their - * respective column
    • - *
  • Fragments without a column are placed in the right-most column. - *
    • - *
  • Fragments with overlapping row numbers. The last fragment has - * priority pushing the fragment in that row down one row.
    • + * respective column + *
  • Fragments without a column are placed in the right-most column.
    • + *
  • Fragments with overlapping row numbers. The last fragment has + * priority pushing the fragment in that row down one row.
    • *
* * @param fragment @@ -330,9 +331,9 @@ } /** - * @return java.util.Collection all of columns (also - * Collection objects) in order within this layout. All Collections - * are immutable. + * @return java.util.Collection all of columns (also Collection + * objects) in order within this layout. All Collections are + * immutable. */ public Collection getColumns() { @@ -392,7 +393,9 @@ throws EmptyLayoutLocationException, InvalidLayoutLocationException { SortedMap column = getColumnMap(columnNumber); - Integer rowInteger = new Integer(rowNumber); + // DONE Findbugs + // Integer rowInteger = new Integer(rowNumber); + Integer rowInteger = Integer.valueOf(rowNumber); if (column.containsKey(rowInteger)) { return (Fragment) column.get(rowInteger); @@ -730,7 +733,9 @@ throws InvalidLayoutLocationException, LayoutEventException { SortedMap oldColumn = getColumnMap(oldCoordinate.getX()); - oldColumn.remove(new Integer(oldCoordinate.getY())); + // DONE Findbugs + // oldColumn.remove(new Integer(oldCoordinate.getY())); + oldColumn.remove(Integer.valueOf(oldCoordinate.getY())); coordinates.remove(fragment); doAdd(newCoordinate.getX(), newCoordinate.getY(), fragment); @@ -777,7 +782,9 @@ { SortedMap column = getColumnMap(columnNumber); - Integer rowInteger = new Integer(rowNumber); + // DONE Findbugs + // Integer rowInteger = new Integer(rowNumber); + Integer rowInteger = Integer.valueOf(rowNumber); LayoutCoordinate targetCoordinate = new LayoutCoordinate(columnNumber, rowNumber); if (column.containsKey(rowInteger)) @@ -818,7 +825,9 @@ protected final SortedMap getColumnMap(int columnNumber) throws InvalidLayoutLocationException { - Integer columnNumberIneteger = new Integer(columnNumber); + // DONE Findbugs + // Integer columnNumberIneteger = new Integer(columnNumber); + Integer columnNumberIneteger = Integer.valueOf(columnNumber); if (columns.containsKey(columnNumberIneteger)) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/BaseObjectProxy.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/BaseObjectProxy.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/BaseObjectProxy.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -38,9 +38,12 @@ { try { + // TODO Findbugs hashCodeMethod = Object.class.getMethod("hashCode", null); + // TODO Findbugs equalsMethod = Object.class.getMethod("equals", new Class[] {Object.class}); + // TODO Findbugs toStringMethod = Object.class.getMethod("toString", null); } catch (NoSuchMethodException e) @@ -86,7 +89,9 @@ protected Integer proxyHashCode(Object proxy) { - return new Integer(System.identityHashCode(proxy)); + // DONE Findbugs + // return new Integer(System.identityHashCode(proxy)); + return Integer.valueOf(System.identityHashCode(proxy)); } protected Boolean proxyEquals(Object proxy, Object other) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/JetspeedLongObjectID.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -31,7 +31,9 @@ public JetspeedLongObjectID(long oid) { - this.oid = new Long(oid); + // DONE Findbugs + // this.oid = new Long(oid); + this.oid = Long.valueOf(oid); } public JetspeedLongObjectID(Long oid) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/CapabilityMapImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -227,7 +227,10 @@ Iterator mediatypes = mediaTypeMap.values().iterator(); while (mediatypes.hasNext()) { - if (((MediaType) mediatypes.next()).getName() == media) { return true; } + // if (((MediaType) mediatypes.next()).getName() == media) { return + // true; } + // DONE Findbugs J2 + if (((MediaType) mediatypes.next()).getName().equals(media)) { return true; } } return false; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -272,17 +272,18 @@ } - if (map != null) - { - return map; - } - else - { - throw new UnableToBuildCapabilityMapException( - "We were unable to build a capability map for the agent, " - + userAgent - + ". This might be an indiciation that the capability database has not been correctly initialized."); - } + // DONE Findbugs + // if (map != null) + // { + // return map; + // } + // else + // { + throw new UnableToBuildCapabilityMapException( + "We were unable to build a capability map for the agent, " + + userAgent + + ". This might be an indiciation that the capability database has not been correctly initialized."); + // } } /** @@ -380,7 +381,9 @@ } /* - * @see org.apache.jetspeed.capabilities.CapabilityService#getMediaTypesForMimeTypes(java.util.Iterator) + * @see + * org.apache.jetspeed.capabilities.CapabilityService#getMediaTypesForMimeTypes + * (java.util.Iterator) */ public Collection getMediaTypesForMimeTypes(Iterator mimetypes) { @@ -429,7 +432,9 @@ } /* - * @see org.apache.jetspeed.capabilities.CapabilityService#deleteCapabilityMapCache() + * @see + * org.apache.jetspeed.capabilities.CapabilityService#deleteCapabilityMapCache + * () */ public void deleteCapabilityMapCache() { @@ -440,7 +445,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.CapabilityService#getMediaType(java.lang.String) + * @see + * org.apache.jetspeed.capabilities.CapabilityService#getMediaType(java. + * lang.String) */ public MediaType getMediaType(String mediaType) { @@ -582,7 +589,8 @@ } /* - * @see org.apache.jetspeed.capabilities.Capabilities#setMimeTypeBeanName(String) + * @see + * org.apache.jetspeed.capabilities.Capabilities#setMimeTypeBeanName(String) */ public void setMimeTypeBeanName(String mimeTypeBeanName) { @@ -598,7 +606,8 @@ } /* - * @see org.apache.jetspeed.capabilities.Capabilities#setClientBeanName(String) + * @see + * org.apache.jetspeed.capabilities.Capabilities#setClientBeanName(String) */ public void setClientBeanName(String clientBeanName) { @@ -614,7 +623,9 @@ } /* - * @see org.apache.jetspeed.capabilities.Capabilities#setMediaTypeBeanName(String) + * @see + * org.apache.jetspeed.capabilities.Capabilities#setMediaTypeBeanName(String + * ) */ public void setMediaTypeBeanName(String mediaTypeBeanName) { @@ -622,7 +633,8 @@ } /* - * @see org.apache.jetspeed.capabilities.Capabilities#getCapabilityBeanName() + * @see + * org.apache.jetspeed.capabilities.Capabilities#getCapabilityBeanName() */ public String getCapabilityBeanName() { @@ -630,7 +642,9 @@ } /* - * @see org.apache.jetspeed.capabilities.Capabilities#setCapabilityBeanName(String) + * @see + * org.apache.jetspeed.capabilities.Capabilities#setCapabilityBeanName(String + * ) */ public void setCapabilityBeanName(String capabilityBeanName) { @@ -668,7 +682,8 @@ } /* - * @see org.apache.jetspeed.capabilities.Capabilities#createCapability(String) + * @see + * org.apache.jetspeed.capabilities.Capabilities#createCapability(String) */ public Capability createCapability(String capabilityName) throws ClassNotFoundException @@ -698,7 +713,8 @@ } /* - * @see org.apache.jetspeed.capabilities.Capabilities#createMediaType(String) + * @see + * org.apache.jetspeed.capabilities.Capabilities#createMediaType(String) */ public MediaType createMediaType(String mediaTypeName) throws ClassNotFoundException @@ -759,7 +775,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.MimeTypeservice#getCapability(java.lang.String) + * @see + * org.apache.jetspeed.capabilities.MimeTypeservice#getCapability(java.lang + * .String) */ public MimeType getMimeType(String mimeType) { @@ -785,7 +803,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.MimeTypeservice#getClientjava.lang.String) + * @see + * org.apache.jetspeed.capabilities.MimeTypeservice#getClientjava.lang.String + * ) */ public Client getClient(String clientName) { @@ -810,7 +830,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.MimeTypeservice#getCapability(java.lang.String) + * @see + * org.apache.jetspeed.capabilities.MimeTypeservice#getCapability(java.lang + * .String) */ public Capability getCapability(String capability) { @@ -836,7 +858,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.Capabilities#storeMediaType(MediaType) + * @see + * org.apache.jetspeed.capabilities.Capabilities#storeMediaType(MediaType) */ public void storeMediaType(MediaType mediaType) throws CapabilitiesException @@ -849,7 +872,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.Capabilities#deleteMediaType(MediaType) + * @see + * org.apache.jetspeed.capabilities.Capabilities#deleteMediaType(MediaType) */ public void deleteMediaType(MediaType mediaType) throws CapabilitiesException @@ -861,7 +885,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.Capabilities#storeCapability(MediaType) + * @see + * org.apache.jetspeed.capabilities.Capabilities#storeCapability(MediaType) */ public void storeCapability(Capability capability) throws CapabilitiesException @@ -874,7 +899,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.Capabilities#deleteCapability(Capability) + * @see + * org.apache.jetspeed.capabilities.Capabilities#deleteCapability(Capability + * ) */ public void deleteCapability(Capability capability) throws CapabilitiesException @@ -886,7 +913,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.Capabilities#storeMimeType(MimeType) + * @see + * org.apache.jetspeed.capabilities.Capabilities#storeMimeType(MimeType) */ public void storeMimeType(MimeType mimeType) throws CapabilitiesException { @@ -898,7 +926,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.capabilities.Capabilities#deleteMimeType(MimeType) + * @see + * org.apache.jetspeed.capabilities.Capabilities#deleteMimeType(MimeType) */ public void deleteMimeType(MimeType mimeType) throws CapabilitiesException { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -239,7 +239,8 @@ ContentCacheElement ccElement = (ContentCacheElement) element; EhDecorationContentCacheElementImpl impl = (EhDecorationContentCacheElementImpl) element; - Element ehl = impl.getImplElement(); + // DONE Findbugs + // Element ehl = impl.getImplElement(); String userKey = ccElement.getContentCacheKey().getSessionId(); if (userKey == null) { @@ -325,6 +326,7 @@ { boolean isAjaxRequest = (context == null); String mode = isAjaxRequest ? "-d-" : "-p-"; + // TODO Findbugs String user = context.getRequest().getRemoteUser(); if (user == null) user = "guest"; return user + mode + context.getPage().getId(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -238,7 +238,8 @@ ContentCacheElement ccElement = (ContentCacheElement) element; EhPortletContentCacheElementImpl impl = (EhPortletContentCacheElementImpl) element; - Element ehl = impl.getImplElement(); + // DONE Findbugs + // Element ehl = impl.getImplElement(); String userKey = ccElement.getContentCacheKey().getSessionId(); if (userKey == null) { @@ -324,6 +325,7 @@ { boolean isAjaxRequest = (context == null); String mode = isAjaxRequest ? "-d-" : "-p-"; + // TODO Findbugs String user = context.getRequest().getRemoteUser(); if (user == null) user = "guest"; return user + mode + context.getPage().getId(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/mocks/ResourceLocatingServletContext.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -239,11 +239,18 @@ Map initParamMap = servletInfo.getInitParamMap(); - for (Iterator itParam = initParamMap.keySet().iterator(); itParam + // for (Iterator itParam = initParamMap.keySet().iterator(); + // itParam + // .hasNext();) + // DONE Findbugs + for (Iterator itParam = initParamMap.entrySet().iterator(); itParam .hasNext();) { - String paramName = (String) itParam.next(); - String paramValue = (String) initParamMap.get(paramName); + // String paramName = (String) itParam.next(); + // String paramValue = (String) initParamMap.get(paramName); + Map.Entry entry = (Map.Entry) itParam.next(); + String paramName = (String) entry.getKey(); + String paramValue = (String) entry.getKey(); servletConfig.setInitParameter(paramName, paramValue); } @@ -252,6 +259,7 @@ this.servletInstanceMap.put(servletInfo.getServletName(), servlet); } + // TODO Findbugs catch (Exception e) { log.error("Failed to load and initialize servlet: " Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/components/BaseMockComponent.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/components/BaseMockComponent.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/components/BaseMockComponent.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -101,7 +101,9 @@ { if (key.equals("1")) { - return new Integer(getValue1()); + // DONE Findbugs + // return new Integer(getValue1()); + return Integer.valueOf(getValue1()); } else if (key.equals("2")) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/header-resource/src/java/org/apache/jetspeed/headerresource/impl/HeaderResourceImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -628,7 +628,9 @@ if (headerType != null) { headerTypePair = new Object[] - {new Integer(headerTypeId), null}; + // DONE Findbugs + // {new Integer(headerTypeId), null}; + {Integer.valueOf(headerTypeId), null}; headerTypes.put(headerName, headerTypePair); } } @@ -956,8 +958,8 @@ { StringBuffer basetagOut = new StringBuffer(); // - // src='$jetspeedDesktop.getPortalResourceUrl("/javascript/dojo/dojo.js")' + //src='http://localhost:8080/jetspeed/javascript/dojo/dojo.js'> + //src='$jetspeedDesktop.getPortalResourceUrl("/javascript/dojo/dojo.js")' String fullPortalBaseUrl = HeaderResourceLib.getPortalBaseUrl( this.requestContext, this.baseUrlAccess, true); String href = HeaderResourceLib.getPortalResourceUrl("/", @@ -1112,8 +1114,8 @@ { StringBuffer initOut = new StringBuffer(); // - // src='$jetspeedDesktop.getPortalResourceUrl("/javascript/dojo/dojo.js")' + //src='http://localhost:8080/jetspeed/javascript/dojo/dojo.js'> + //src='$jetspeedDesktop.getPortalResourceUrl("/javascript/dojo/dojo.js")' initOut.append(""); @@ -1174,7 +1176,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.headerresource.impl.HeaderResource#addHeaderInfo(java.lang.String) + * @see + * org.apache.jetspeed.headerresource.impl.HeaderResource#addHeaderInfo( + * java.lang.String) */ public void addHeaderInfo(String text) { @@ -1189,8 +1193,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.headerresource.impl.HeaderResource#addHeaderInfo(java.lang.String, - * java.util.Map,java.lang.String) + * @see + * org.apache.jetspeed.headerresource.impl.HeaderResource#addHeaderInfo( + * java.lang.String, java.util.Map,java.lang.String) */ public void addHeaderInfo(String elementName, Map attributes, String text) { @@ -1222,8 +1227,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.headerresource.impl.HeaderResource#addJavaScript(java.lang.String, - * boolean) + * @see + * org.apache.jetspeed.headerresource.impl.HeaderResource#addJavaScript( + * java.lang.String, boolean) */ public void addJavaScript(String path, boolean defer) { @@ -1240,7 +1246,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.headerresource.impl.HeaderResource#addJavaScript(java.lang.String) + * @see + * org.apache.jetspeed.headerresource.impl.HeaderResource#addJavaScript( + * java.lang.String) */ public void addJavaScript(String path) { @@ -1250,7 +1258,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.headerresource.impl.HeaderResource#addStyleSheet(java.lang.String) + * @see + * org.apache.jetspeed.headerresource.impl.HeaderResource#addStyleSheet( + * java.lang.String) */ public void addStyleSheet(String path) { @@ -1284,6 +1294,7 @@ */ private String text; + // TODO Findbugs public HeaderInfo(String elementName) { this(elementName, new HashMap()); @@ -1320,13 +1331,19 @@ Map attrMap = getAttributes(); if (attrMap != null) { - Set keySet = attrMap.keySet(); - for (Iterator ite = keySet.iterator(); ite.hasNext();) + // Set keySet = attrMap.keySet(); + Set entrySet = attrMap.entrySet(); + // DONE Findbugs + // for (Iterator ite = keySet.iterator(); ite.hasNext();) + for (Iterator ite = entrySet.iterator(); ite.hasNext();) { - String key = (String) ite.next(); + Map.Entry _entry = (Map.Entry) ite.next(); + // String key = (String) ite.next(); + String key = (String) _entry.getKey(); buf.append(key); buf.append("=\""); - buf.append((String) attrMap.get(key)); + // buf.append((String) attrMap.get(key)); + buf.append((String) _entry.getValue()); buf.append("\" "); } } @@ -1351,6 +1368,7 @@ public boolean equals(Object o) { + // TODO Findbugs if (o instanceof HeaderInfo) { HeaderInfo headerInfo = (HeaderInfo) o; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobQueue.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobQueue.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobQueue.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -164,8 +164,8 @@ * * @param je * A JobEntry to be updated. - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ public synchronized void updateQueue(JobEntry je) throws Exception { @@ -184,8 +184,11 @@ public int compare(Object o1, Object o2) { - Long time1 = new Long(((JobEntry) o1).getNextRuntime()); - Long time2 = new Long(((JobEntry) o2).getNextRuntime()); + // DONE Findbugs + // Long time1 = new Long(((JobEntry) o1).getNextRuntime()); + // Long time2 = new Long(((JobEntry) o2).getNextRuntime()); + Long time1 = Long.valueOf(((JobEntry) o1).getNextRuntime()); + Long time2 = Long.valueOf(((JobEntry) o2).getNextRuntime()); return (time1.compareTo(time2)); } }; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/util/OverwriteProperties.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -232,7 +232,9 @@ key = tokenizer.nextToken().trim(); if (key != null && key.length() > 0) { - baseMap.put(key, new Integer(index)); + // DONE Findbugs + // baseMap.put(key, new Integer(index)); + baseMap.put(key, Integer.valueOf(index)); if (verbose) { System.out @@ -425,7 +427,9 @@ System.out.println("Adding new entry to baseArray[" + index + "] = " + line); } - baseMap.put(key, new Integer(index)); + // DONE Findbugs + // baseMap.put(key, new Integer(index)); + baseMap.put(key, Integer.valueOf(index)); if (verbose) { System.out.println("baseMap[" + key + "," + index Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/administration/AdminUtil.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/administration/AdminUtil.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/administration/AdminUtil.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -65,7 +65,9 @@ // was not available. e.printStackTrace(); } - rs.setLength(new Integer(12)); + // DONE Findbugs + // rs.setLength(new Integer(12)); + rs.setLength(Integer.valueOf(12)); rs.setSingle(PASS_CHARS, PASS_CHARS.length); ArrayList upper = new ArrayList(); ArrayList lower = new ArrayList(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/HeaderAggregatorImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -346,7 +346,9 @@ if (headerTypeId >= 0) { headerTypes.put(headerName, new Object[] - {new Integer(headerTypeId), null}); + // DONE Findbugs + // {new Integer(headerTypeId), null}); + {Integer.valueOf(headerTypeId), null}); } else { @@ -589,7 +591,9 @@ } if (headerTypePair[0] == null && headerTypeId >= 0) { // change only if value from configuration is null - headerTypePair[0] = new Integer(headerTypeId); + // DONE Findbugs + // headerTypePair[0] = new Integer(headerTypeId); + headerTypePair[0] = Integer.valueOf(headerTypeId); } if (headerTypePair[1] == null && headerReqFlag != null && headerReqFlag.length() > 0) @@ -1397,8 +1401,8 @@ * namedResourcesDefault.entrySet().iterator(); while ( * namedResourcesDefaultIter.hasNext() ) { Map.Entry rsrcEntry = * (Map.Entry)namedResourcesDefaultIter.next(); Object rsrcVal = - * rsrcEntry.getValue(); log.debug( rsrcEntry.getKey().toString() + ": " + - * EOL + ( rsrcVal != null ? rsrcVal.toString() : "null" ) ); } } + * rsrcEntry.getValue(); log.debug( rsrcEntry.getKey().toString() + ": " + * + EOL + ( rsrcVal != null ? rsrcVal.toString() : "null" ) ); } } */ if (dynamicConfigDefault != null || namedResourcesDefault != null Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PageAggregatorImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -138,10 +138,12 @@ { String message = "Maximized fragment not found."; log.error(message); - if (maxedContentFragment != null) - maxedContentFragment - .overrideRenderedContent("Sorry, but we were unable access the requested portlet. Send the following message to your portal admin: " - + message); + // DONE Findbugs + // if (maxedContentFragment != null) + // maxedContentFragment + // .overrideRenderedContent( + // "Sorry, but we were unable access the requested portlet. Send the following message to your portal admin: " + // + message); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeInformationImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeInformationImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeInformationImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -79,10 +79,13 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { + // TODO Findbugs int version = in.readByte(); // do changes here if version dependant - id = new Long(in.readLong()); + // DONE Findbugs + // id = new Long(in.readLong()); + id = Long.valueOf(in.readLong()); contextName = in.readUTF(); int dateSet = in.readByte(); @@ -94,6 +97,7 @@ public boolean equals(Object object) { + // TODO Findbugs if (object == this) return true; if (!(object instanceof NodeInformation)) return false; return equals((NodeInformation) object); @@ -169,7 +173,9 @@ public void setId(long id) { - this.id = new Long(id); + // DONE Findbugs + // this.id = new Long(id); + this.id = Long.valueOf(id); } public Date getLastDeployDate() Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/namespace/JetspeedNamespaceMapperImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/namespace/JetspeedNamespaceMapperImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/namespace/JetspeedNamespaceMapperImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -70,14 +70,17 @@ public String encode(long id, String name) { - return encode(new Long(id).toString(), name); + // DONE Findbugs + // return encode(new Long(id).toString(), name); + return encode(Long.valueOf(id).toString(), name); } /* * (non-Javadoc) * - * @see org.apache.pluto.util.NamespaceMapper#encode(org.apache.pluto.om.common.ObjectID, - * java.lang.String) + * @see + * org.apache.pluto.util.NamespaceMapper#encode(org.apache.pluto.om.common + * .ObjectID, java.lang.String) */ public String encode(ObjectID ns, String name) { @@ -87,8 +90,9 @@ /* * (non-Javadoc) * - * @see org.apache.pluto.util.NamespaceMapper#encode(org.apache.pluto.om.common.ObjectID, - * org.apache.pluto.om.common.ObjectID, java.lang.String) + * @see + * org.apache.pluto.util.NamespaceMapper#encode(org.apache.pluto.om.common + * .ObjectID, org.apache.pluto.om.common.ObjectID, java.lang.String) */ public String encode(ObjectID ns1, ObjectID ns2, String name) { @@ -98,8 +102,9 @@ /* * (non-Javadoc) * - * @see org.apache.pluto.util.NamespaceMapper#decode(org.apache.pluto.om.common.ObjectID, - * java.lang.String) + * @see + * org.apache.pluto.util.NamespaceMapper#decode(org.apache.pluto.om.common + * .ObjectID, java.lang.String) */ public String decode(ObjectID ns, String name) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/HybridNavigationalState.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/HybridNavigationalState.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/state/impl/HybridNavigationalState.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -53,14 +53,19 @@ throws UnsupportedEncodingException { Map subset = new HashMap(); - Iterator params = parameters.keySet().iterator(); + // DONE Findbugs + // Iterator params = parameters.keySet().iterator(); + Iterator params = parameters.entrySet().iterator(); while (params.hasNext()) { - String key = (String) params.next(); + Map.Entry _entry = (Map.Entry) params.next(); + String key = (String) _entry.getKey(); + // String key = (String) params.next(); if (key.startsWith(prefix)) { // only encode params that start with prefix - subset.put(key, parameters.get(key)); + // subset.put(key, parameters.get(key)); + subset.put(key, _entry.getValue()); } } return super.encode(window, subset, mode, state, action); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -175,7 +175,9 @@ String actionURL = rc.getResponse().encodeURL( (isAjaxRequest == null) ? portalURL.createPortletURL(pw, pm, - ws, portalURL.isSecure()).toString() : portalURL + // DONE Findbugs + // ws, portalURL.isSecure()).toString() : portalURL + ws, portalURL.isSecure()) : portalURL .createNavigationalEncoding(pw, pm, ws)); String linkURL = decoration Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -546,7 +546,9 @@ window, PortletMode.VIEW, WindowState.NORMAL) : portalURL.createPortletURL(window, PortletMode.VIEW, WindowState.NORMAL, - portalURL.isSecure()).toString()); + // DONE Findbugs + // portalURL.isSecure()).toString()); + portalURL.isSecure())); String actionName = PortletMode.VIEW.toString(); pageModes.add(new DecoratorAction(actionName, requestContext .getLocale(), decoration.getResource("images/" @@ -572,13 +574,17 @@ WindowState.NORMAL, true) : portalURL .createPortletURL(window, parameters, PortletMode.VIEW, WindowState.NORMAL, - true, portalURL.isSecure()).toString()); + // DONE Findbugs + // true, + // portalURL.isSecure()).toString()); + true, portalURL.isSecure())); pageModes.add(new DecoratorAction(targetMode, requestContext .getLocale(), decoration.getResource("images/" + targetMode + ".gif"), action, DecoratorActionTemplate.ACTION_TYPE_MODE)); - // window.getPortletEntity().getPortletDefinition().getInitParameterSet().get( + // window.getPortletEntity().getPortletDefinition(). + // getInitParameterSet().get( // "xxxx" ); if (content.supportsPortletMode(PortletMode.HELP)) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -44,7 +44,8 @@ * Implementation of {@link org.apache.jetspeed.deployment.DeploymentManager} * * @author Scott T. Weaver - * @version $Id: StandardDeploymentManager.java 517121 2007-03-12 07:45:49Z ate $ + * @version $Id: StandardDeploymentManager.java 517121 2007-03-12 07:45:49Z ate + * $ */ public class StandardDeploymentManager implements DeploymentManager { @@ -141,7 +142,8 @@ .getThreadGroup(), "Autodeployment File Scanner Thread"); scanner.setDaemon(true); - // scanner.setContextClassLoader(Thread.currentThread().getContextClassLoader()); + // scanner.setContextClassLoader(Thread.currentThread(). + // getContextClassLoader()); scanner.setContextClassLoader(getClass().getClassLoader()); scanner.start(); log.info("Deployment scanner successfuly started!"); @@ -259,8 +261,10 @@ log.error("Failure deploying " + aFile.getAbsolutePath()); } - ignoredFiles.put(aFile.getAbsolutePath(), new Long(aFile - .lastModified())); + // DONE Findbugs + // ignoredFiles.put(aFile.getAbsolutePath(), new Long(aFile + ignoredFiles.put(aFile.getAbsolutePath(), Long + .valueOf(aFile.lastModified())); } } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/simpleregistry/Entry.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/simpleregistry/Entry.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/simpleregistry/Entry.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -99,7 +99,9 @@ public String toString() { - return getClass().toString().toString() + ":" + getId(); + // DONE Findbugs + // return getClass().toString().toString() + ":" + getId(); + return getClass().toString() + ":" + getId(); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/desktop/impl/JetspeedDesktopImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -256,7 +256,9 @@ /** tool for directing output to html <head> */ private HeaderResourceFactory headerResourceFactory; - /** cache to minimize production of generated desktop configuration content * */ + /** + * cache to minimize production of generated desktop configuration content * + */ private JetspeedCache desktopContentCache; /** base portal URL to override default URL server info from servlet */ @@ -889,8 +891,10 @@ } catch (NumberFormatException ex) { - maxLayoutNestingObj = new Integer( - DESKTOP_PAGEEDITOR_PAGE_LAYOUT_DEPTH_MAX_DEFAULT); + // DONE Findbugs + // maxLayoutNestingObj = new Integer( + maxLayoutNestingObj = Integer + .valueOf(DESKTOP_PAGEEDITOR_PAGE_LAYOUT_DEPTH_MAX_DEFAULT); } int maxLayoutNesting = maxLayoutNestingObj.intValue(); if (maxLayoutNesting < 0) maxLayoutNesting = 0; @@ -921,8 +925,11 @@ // content, like "manager" or "admin" int rndVal = getRandom(rnd, 0x1000, 0xFFFD); boolean isRndValEven = ((rndVal % 2) == 0); - int rndValTens = (int) Math.floor(rndVal / 10); - int rndValTensEven = (((rndValTens % 2) == 1) ? Math.max( + // DONE Findbugs + int rndValTens = (int) Math.floor(rndVal / (double) 10); + // DONE Findbugs + // int rndValTensEven = (((rndValTens % 2) == 1) ? Math.max( + int rndValTensEven = (((rndValTens % 2) != 0) ? Math.max( rndValTens - 1, 2) : rndValTens); int valToHex; if (i == 0) @@ -930,11 +937,16 @@ valToHex = pageEditorConfigFlags[0]; } else if (addedExtras < extrasCount - && (((i % 2) == 1) || nextRoleChar >= allowEditNoactionsRoleCharsLen)) + // DONE Findbugs + // && (((i % 2) == 1) || nextRoleChar >= + // allowEditNoactionsRoleCharsLen)) + && (((i % 2) != 0) || nextRoleChar >= allowEditNoactionsRoleCharsLen)) { if (!isRndValEven) rndVal++; valToHex = getRandom(rnd, 0x0A00, 0xDFFF); - if ((valToHex % 2) == 1) valToHex = valToHex + 1; + // DONE Findbugs + // if ((valToHex % 2) == 1) valToHex = valToHex + 1; + if ((valToHex % 2) != 0) valToHex = valToHex + 1; pageEditorSettings.append(", "); addedExtras++; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/core/PortalContextProviderImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -73,7 +73,9 @@ /* * (non-Javadoc) * - * @see org.apache.pluto.services.information.PortalContextProvider#getPortalContext() + * @see + * org.apache.pluto.services.information.PortalContextProvider#getPortalContext + * () */ public PortalContext getPortalContext() { @@ -224,7 +226,9 @@ public void reset(String portalInfo) { - info = new String(portalInfo); + // DONE Findbugs + // info = new String(portalInfo); + info = portalInfo; // these are the minimum modes that the portal needs to support modes = getDefaultModes(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserListAction.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserListAction.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserListAction.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -48,8 +48,8 @@ * * AJAX action: action: getuserlist * - * AJAX Parameters: guest: whether we should return also the guest sessions true | - * false (default) userinfo: whether we should include also userinfo true | + * AJAX Parameters: guest: whether we should return also the guest sessions true + * | false (default) userinfo: whether we should include also userinfo true | * false (default) offline: whether we should include offline users true | false * (default) all: return every bits and piece there is true | false (default) * @@ -60,6 +60,7 @@ AjaxBuilder, Constants { + // TODO Findbugs protected Log log = LogFactory.getLog(GetUserListAction.class); private PortalStatistics pstats = null; @@ -215,8 +216,12 @@ Map singleUserMap = new HashMap(); singleUserMap.put(USERNAME, userStat .getUsername()); - singleUserMap.put(SESSIONS, new Integer( - userStat.getNumberOfSessions())); + // DONE Findbugs + // singleUserMap.put(SESSIONS, new Integer( + // userStat.getNumberOfSessions())); + singleUserMap.put(SESSIONS, + Integer.valueOf(userStat + .getNumberOfSessions())); singleUserMap.put(STATUS, ONLINE); singleUserMap.put(IPADDRESS, userStat .getInetAddress().getHostAddress()); @@ -299,6 +304,7 @@ } resultMap.put(STATUS, status); } + // TODO Findbugs catch (Exception e) { log.error("exception statistics access", e); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -301,7 +301,9 @@ { int row = Integer.parseInt(rowStr); if (row < 0) row = 0; - return new Integer(row); + // DONE Findbugs + // return new Integer(row); + return Integer.valueOf(row); } catch (NumberFormatException ex) { @@ -323,6 +325,7 @@ return col; } + // TODO Findbugs class FragmentLinkedListInfo { @@ -374,6 +377,7 @@ } } + // TODO Findbugs class FragmentLinkedListEntry { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/SecurityConstraintsAction.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -190,10 +190,11 @@ int min = (xmlSize < defsSize) ? xmlSize : defsSize; List xmlConstraints = root.getChildren("security-constraint"); List constraints = def.getSecurityConstraints(); - Element owner = root.getChild("owner"); - if (owner != null) - { - } + // DONE Findbugs + // Element owner = root.getChild("owner"); + // if (owner != null) + // { + // } for (int ix = 0; ix < min; ix++) { Element xmlConstraint = (Element) xmlConstraints.get(ix); @@ -237,6 +238,7 @@ } pageManager.updatePageSecurity(pageSecurity); } + // TODO Findbugs catch (Exception e) { System.out Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -51,7 +51,9 @@ Integer retryCount = (Integer) session .getAttribute(LoginConstants.RETRYCOUNT); if (retryCount == null) - retryCount = new Integer(1); + // DONE Findbugs + // retryCount = new Integer(1); + retryCount = Integer.valueOf(1); else retryCount = new Integer(retryCount.intValue() + 1); session.setAttribute(LoginConstants.RETRYCOUNT, retryCount); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LoginProxyServlet.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -84,7 +84,9 @@ else { username = (String) session.getAttribute(LoginConstants.USERNAME); - parameter = (String) session.getAttribute(LoginConstants.PASSWORD); + // DONE Findbugs + // parameter = (String) + // session.getAttribute(LoginConstants.PASSWORD); } // Globaly override all psml themes Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/resource/BufferedHttpServletResponse.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/resource/BufferedHttpServletResponse.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/resource/BufferedHttpServletResponse.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -271,7 +271,9 @@ /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#addCookie(javax.servlet.http.Cookie) + * @see + * javax.servlet.http.HttpServletResponseWrapper#addCookie(javax.servlet + * .http.Cookie) */ public void addCookie(Cookie cookie) { @@ -288,23 +290,27 @@ /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#addDateHeader(java.lang.String, - * long) + * @see + * javax.servlet.http.HttpServletResponseWrapper#addDateHeader(java.lang + * .String, long) */ public void addDateHeader(String name, long date) { if (!committed) { ArrayList headerList = getHeaderList(name, true); - headerList.add(new Long(date)); + // DONE Findbugs + // headerList.add(new Long(date)); + headerList.add(Long.valueOf(date)); } } /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#addHeader(java.lang.String, - * java.lang.String) + * @see + * javax.servlet.http.HttpServletResponseWrapper#addHeader(java.lang.String, + * java.lang.String) */ public void addHeader(String name, String value) { @@ -318,22 +324,27 @@ /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#addIntHeader(java.lang.String, - * int) + * @see + * javax.servlet.http.HttpServletResponseWrapper#addIntHeader(java.lang. + * String, int) */ public void addIntHeader(String name, int value) { if (!committed) { ArrayList headerList = getHeaderList(name, true); - headerList.add(new Integer(value)); + // DONE Findbugs + // headerList.add(new Integer(value)); + headerList.add(Integer.valueOf(value)); } } /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#containsHeader(java.lang.String) + * @see + * javax.servlet.http.HttpServletResponseWrapper#containsHeader(java.lang + * .String) */ public boolean containsHeader(String name) { @@ -344,7 +355,7 @@ * (non-Javadoc) * * @see javax.servlet.http.HttpServletResponseWrapper#sendError(int, - * java.lang.String) + * java.lang.String) */ public void sendError(int errorCode, String errorMessage) throws IOException @@ -370,7 +381,9 @@ /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#sendRedirect(java.lang.String) + * @see + * javax.servlet.http.HttpServletResponseWrapper#sendRedirect(java.lang. + * String) */ public void sendRedirect(String redirectLocation) throws IOException { @@ -383,8 +396,9 @@ /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#setDateHeader(java.lang.String, - * long) + * @see + * javax.servlet.http.HttpServletResponseWrapper#setDateHeader(java.lang + * .String, long) */ public void setDateHeader(String name, long date) { @@ -392,15 +406,18 @@ { ArrayList headerList = getHeaderList(name, true); headerList.clear(); - headerList.add(new Long(date)); + // DONE Findbugs + // headerList.add(new Long(date)); + headerList.add(Long.valueOf(date)); } } /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#setHeader(java.lang.String, - * java.lang.String) + * @see + * javax.servlet.http.HttpServletResponseWrapper#setHeader(java.lang.String, + * java.lang.String) */ public void setHeader(String name, String value) { @@ -415,8 +432,9 @@ /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponseWrapper#setIntHeader(java.lang.String, - * int) + * @see + * javax.servlet.http.HttpServletResponseWrapper#setIntHeader(java.lang. + * String, int) */ public void setIntHeader(String name, int value) { @@ -424,7 +442,9 @@ { ArrayList headerList = getHeaderList(name, true); headerList.clear(); - headerList.add(new Integer(value)); + // DONE Findbugs + // headerList.add(new Integer(value)); + headerList.add(Integer.valueOf(value)); } } @@ -432,7 +452,7 @@ * (non-Javadoc) * * @see javax.servlet.http.HttpServletResponseWrapper#setStatus(int, - * java.lang.String) + * java.lang.String) */ public void setStatus(int statusCode, String message) { @@ -620,7 +640,9 @@ /* * (non-Javadoc) * - * @see javax.servlet.ServletResponseWrapper#setCharacterEncoding(java.lang.String) + * @see + * javax.servlet.ServletResponseWrapper#setCharacterEncoding(java.lang.String + * ) */ public void setCharacterEncoding(String charset) { @@ -662,7 +684,8 @@ /* * (non-Javadoc) * - * @see javax.servlet.ServletResponseWrapper#setContentType(java.lang.String) + * @see + * javax.servlet.ServletResponseWrapper#setContentType(java.lang.String) */ public void setContentType(String type) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/PasswordCredentialValveImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -115,7 +115,11 @@ { if (pwdCredential.isUpdateRequired()) { - passwordDaysValid = new Integer(0); // required change + // DONE Findbugs + // passwordDaysValid = new Integer(0); // required + // change + passwordDaysValid = Integer.valueOf(0); // required + // change } if (request.getSessionAttribute(CHECKED_KEY) == null) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/information/DynamicInformationProviderImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -80,12 +80,16 @@ public String getRequestContentType() { - return context.getMimeType().toString(); + // DONE Findbugs + // return context.getMimeType().toString(); + return context.getMimeType(); } public String getResponseContentType() { - return context.getMimeType().toString(); + // DONE Findbugs + // return context.getMimeType().toString(); + return context.getMimeType(); } public Iterator getResponseContentTypes() @@ -142,7 +146,8 @@ * namespaceMapper.decode(portletWindow.getId(),name); * * if (portletParameter!=null) // it is in the portlet's namespace { - * portletParameters.put(portletParameter, request.getParameterValues(name) ); } } + * portletParameters.put(portletParameter, request.getParameterValues(name) + * ); } } * * PortalURL url = context.getPortalURL(); * Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -82,7 +82,8 @@ *

* * @author Scott T. Weaver - * @version $Id: JetspeedPowerToolImpl.java 589933 2007-10-30 01:51:50Z woonsan $ + * @version $Id: JetspeedPowerToolImpl.java 589933 2007-10-30 01:51:50Z woonsan + * $ * */ public class JetspeedPowerToolImpl implements JetspeedVelocityPowerTool @@ -343,7 +344,8 @@ { checkState(); // return (Page) - // renderRequest.getAttribute(PortalReservedParameters.PAGE_ATTRIBUTE_KEY); + //renderRequest.getAttribute(PortalReservedParameters.PAGE_ATTRIBUTE_KEY + // ); return requestContext.getPage(); } @@ -389,8 +391,7 @@ /** * * @param f - * Fragment whose PortletEntity we want to - * retreive. + * Fragment whose PortletEntity we want to retreive. * @return The PortletEntity represented by the current fragment. * @throws Exception */ @@ -580,26 +581,25 @@ /** *

* The decorator template itself is responsible for including the content of - * the target Fragment which is easily acheived like so:
- * in Velocity: + * the target Fragment which is easily acheived like so:
in Velocity: * * 

-     *   
+     *   <code>
      * $jetspeed.include($jetspeed.currentFragment)
-     * 
+     * </code>
      *
* * In JSP: * * 
-     *   
+     *   <code>
      *  
      *              <% 
      *               JetspeedPowerTool jetspeed = new JetspeedPowerTool(renderRequest, renderResponse, portletConfig);
      *               jetspeed.include(jetspeed.getCurrentFragment());
      *              %>
      *   
-     * 
+     * </code>
      *
* * @@ -664,9 +664,8 @@ * * * @throws java.lang.IllegalStateException - * if the PortletConfig, - * RenderRequest or RenderReponse - * is null. + * if the PortletConfig, RenderRequest + * or RenderReponse is null. */ protected void checkState() { @@ -700,7 +699,10 @@ Path pathObject = new Path(path); if (pathObject.length() > 1) { - template = getTemplate(pathObject.getSegment(1).toString(), + // DONE Findbugs + // template = + // getTemplate(pathObject.getSegment(1).toString(), + template = getTemplate(pathObject.getSegment(1), templateType, locator, descriptor); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/cluster/TestCluster.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/cluster/TestCluster.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/cluster/TestCluster.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -58,7 +58,9 @@ public void testCluser() throws Exception { String contextName = "SOME_NEW_PORTLET_APPLICATION"; - Long id = new Long(10); + // DONE Findbugs + // Long id = new Long(10); + Long id = Long.valueOf(10); assertNotNull("Manager should be instantiated", single); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -168,6 +168,7 @@ * SearchFolder - data object used hold concrete search folder and related * search path profile locator name pairs */ + // TODO Findbugs private class SearchFolder { @@ -332,7 +333,9 @@ } else if (m.equals(HASH_CODE_METHOD)) { - return new Integer(hashCode()); + // DONE Findbugs + // return new Integer(hashCode()); + return Integer.valueOf(hashCode()); } else if (m.equals(IS_HIDDEN_METHOD)) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/LinkProxy.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -112,7 +112,9 @@ } else if (m.equals(HASH_CODE_METHOD)) { - return new Integer(hashCode()); + // DONE Findbugs + // return new Integer(hashCode()); + return Integer.valueOf(hashCode()); } else if (m.equals(IS_HIDDEN_METHOD)) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/om/page/proxy/PageProxy.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -127,7 +127,9 @@ } else if (m.equals(HASH_CODE_METHOD)) { - return new Integer(hashCode()); + // DONE Findbugs + // return new Integer(hashCode()); + return Integer.valueOf(hashCode()); } else if (m.equals(IS_HIDDEN_METHOD)) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuElementImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuElementImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuElementImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -105,6 +105,8 @@ // compare menu implementation by type, url, and // name, instances with no url and no name are // always considered unique + // DONE Findbugs + if (obj == null) { return false; } if (this.getClass().equals(obj.getClass())) { String url = getUrl(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -348,16 +348,20 @@ } if ((pageLocator == null) || (locators.size() > 1)) { - Iterator locatorNameIter = locators.keySet().iterator(); + // DONE Findbugs + // Iterator locatorNameIter = locators.keySet().iterator(); + Iterator locatorNameIter = locators.entrySet().iterator(); while (locatorNameIter.hasNext()) { - String locatorName = (String) locatorNameIter.next(); + Map.Entry _entry = (Map.Entry) locatorNameIter.next(); + // String locatorName = (String) locatorNameIter.next(); + String locatorName = (String) _entry.getKey(); if (!locatorName.equals(ProfileLocator.PAGE_LOCATOR)) { // add alternate locator search paths mergeSearchPathList(locatorName, - (ProfileLocator) locators.get(locatorName), - searchPaths); + // (ProfileLocator) locators.get(locatorName), + (ProfileLocator) _entry.getValue(), searchPaths); } } } @@ -1155,8 +1159,8 @@ * pathRegexpPattern - tests for and converts simple path wildcard and * character class regular exressions to perl5/standard java pattern syntax * - * @param regexp - - * candidate path regular expression + * @param regexp + * - candidate path regular expression * @return - converted pattern or null if no regular expression */ private static String pathRegexpPattern(String regexp) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewMenuDefinitionLocator.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -86,6 +86,9 @@ */ public boolean equals(Object obj) { + // DONE Findbugs + if (obj == null) { return false; } + // TODO Findbugs if (obj instanceof String) { return locator.equals(obj); } return locator.equals(obj.toString()); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteViewSearchPath.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -79,6 +79,9 @@ */ public boolean equals(Object obj) { + // DONE Findbugs + if (obj == null) { return false; } + // TODO Findbugs if (obj instanceof String) { return searchPath.equals(obj); } return searchPath.equals(obj.toString()); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PersistenceBrokerPreferencesProvider.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PersistenceBrokerPreferencesProvider.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PersistenceBrokerPreferencesProvider.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -203,8 +203,8 @@ * Location of repository mapping file. Must be available within * the classpath. * @param prefsFactoryImpl - * java.util.prefs.PreferencesFactory - * implementation to use. + * java.util.prefs.PreferencesFactory implementation + * to use. * @param enablePropertyManager * Whether or not we chould be suing the property manager. * @throws ClassNotFoundException @@ -256,7 +256,9 @@ Criteria c = new Criteria(); c.addEqualTo("fullPath", fullPath); - c.addEqualTo("nodeType", new Integer(nodeType)); + // DONE Findbugs + // c.addEqualTo("nodeType", new Integer(nodeType)); + c.addEqualTo("nodeType", Integer.valueOf(nodeType)); Query query = QueryFactory.newQuery(NodeImpl.class, c); Node nodeObj = (Node) getPersistenceBrokerTemplate().getObjectByQuery( @@ -285,7 +287,9 @@ Criteria c = new Criteria(); c.addEqualTo("fullPath", fullPath); - c.addEqualTo("nodeType", new Integer(nodeType)); + // DONE Findbugs + // c.addEqualTo("nodeType", new Integer(nodeType)); + c.addEqualTo("nodeType", Integer.valueOf(nodeType)); Query query = QueryFactory.newQuery(NodeImpl.class, c); Node nodeObj = (Node) getPersistenceBrokerTemplate().getObjectByQuery( @@ -315,7 +319,9 @@ if (preferenceCache.isKeyInCache(key)) return true; Criteria c = new Criteria(); c.addEqualTo("fullPath", fullPath); - c.addEqualTo("nodeType", new Integer(nodeType)); + // DONE Findbugs + // c.addEqualTo("nodeType", new Integer(nodeType)); + c.addEqualTo("nodeType", Integer.valueOf(nodeType)); Query query = QueryFactory.newQuery(NodeImpl.class, c); Node nodeObj = (Node) getPersistenceBrokerTemplate().getObjectByQuery( @@ -350,7 +356,9 @@ Long parentNodeId = null; if (null != parent) { - parentNodeId = new Long(parent.getNodeId()); + // DONE Findbugs + // parentNodeId = new Long(parent.getNodeId()); + parentNodeId = Long.valueOf(parent.getNodeId()); } Node nodeObj = new NodeImpl(parentNodeId, nodeName, nodeType, @@ -392,7 +400,9 @@ if (hit.isChildrenLoaded()) { return resolveChildren(hit.getChildren()); } Criteria c = new Criteria(); - c.addEqualTo("parentNodeId", new Long(parentNode.getNodeId())); + // DONE Findbugs + // c.addEqualTo("parentNodeId", new Long(parentNode.getNodeId())); + c.addEqualTo("parentNodeId", Long.valueOf(parentNode.getNodeId())); Query query = QueryFactory.newQuery(NodeImpl.class, c); Collection children = getPersistenceBrokerTemplate() .getCollectionByQuery(query); @@ -481,15 +491,15 @@ NodeCache key = new NodeCache(hit); getPersistenceBrokerTemplate().store(hit.getNode()); // avoid racing - // condition - // with the db - // and with - // cluster - // notification + // condition + // with the db + // and with + // cluster + // notification // do the db first preferenceCache.remove(key.getCacheKey()); // not sure we should - // actually do that, could - // also just update the node + // actually do that, could + // also just update the node addToCache(key); } @@ -506,12 +516,12 @@ { getPersistenceBrokerTemplate().delete( ((NodeImplProxy) node).getNode()); // avoid race conditions - // - do this first + // - do this first } else getPersistenceBrokerTemplate().delete(node); // avoid race - // conditions - do - // this first + // conditions - do + // this first if (node instanceof NodeImplProxy) { @@ -657,7 +667,9 @@ return count; } Map parents = new HashMap(); - parents.put(new Long(root.getNode().getNodeId()), root); + // DONE Findbugs + // parents.put(new Long(root.getNode().getNodeId()), root); + parents.put(Long.valueOf(root.getNode().getNodeId()), root); while (ri.hasNext()) { // build children and subchildren Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -63,6 +63,7 @@ private PortletRegistry registry; + // TODO Findbugs private PortletWindowAccessor windowAccessor = null; // 2006-08-22: by default, do not merge preferences from the shared @@ -82,6 +83,7 @@ { super(); this.registry = registry; + // TODO Findbugs PortletEntityImpl.registry = registry; } @@ -90,7 +92,9 @@ { super(); this.registry = registry; + // TODO Findbugs PortletEntityImpl.registry = registry; + // TODO Findbugs PortletEntityImpl.rcc = rcc; } @@ -99,8 +103,11 @@ { super(); this.registry = registry; + // TODO Findbugs PortletEntityImpl.registry = registry; + // TODO Findbugs PortletEntityImpl.rcc = rcc; + // TODO Findbugs PortletEntityImpl.pm = pageManager; } @@ -110,19 +117,24 @@ { super(); this.registry = registry; + // TODO Findbugs PortletEntityImpl.registry = registry; + // TODO Findbugs PortletEntityImpl.rcc = rcc; + // TODO Findbugs PortletEntityImpl.pm = pageManager; this.mergeSharedPreferences = mergeSharedPreferences; } public void setEntityAccessProxy(PortletEntityAccessComponent proxy) { + // TODO Findbugs PortletEntityImpl.pac = proxy; } public void setPageManager(PageManager pageManager) { + // TODO Findbugs PortletEntityImpl.pm = pageManager; } @@ -299,7 +311,9 @@ .setPortletDefinition(parentPortletDef); } } - else if (fragment != null && parentPortletDef == null) + // DONE Findbugs + // else if (fragment != null && parentPortletDef == null) + else if (fragment != null) { // If we have no porlet definition but have a fragment, we see // if the @@ -506,7 +520,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent#isMergeSharedPreferences() + * @see + * org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent + * #isMergeSharedPreferences() */ public boolean isMergeSharedPreferences() { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -25,7 +25,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; @@ -244,7 +243,8 @@ PrefsPreferenceSetImpl sharedSet = new PrefsPreferenceSetImpl( sharedNode); if (sharedSet.size() == 0) return; - Set names = userPrefSet.getNames(); + // DONE Findbugs + // Set names = userPrefSet.getNames(); Iterator sharedPrefs = sharedSet.iterator(); int index = 0; while (sharedPrefs.hasNext()) @@ -492,6 +492,7 @@ return principal; } + // TODO Findbugs class PortletEntityUserPrincipal implements Principal { @@ -579,10 +580,9 @@ * * @see org.apache.jetspeed.components.persistence.store.RemovalAware#postRemoval(org.apache.jetspeed.components.persistence.store.PersistenceStore) * @param store - * @throws - * {@link org.apache.jetspeed.persistence.store.PersistenceStoreRuntimeExcpetion} - * if the removal of the {@link java.util.prefs.Preference} - * related to this entity fails + * @throws {@link org.apache.jetspeed.persistence.store.PersistenceStoreRuntimeExcpetion} + * if the removal of the {@link java.util.prefs.Preference} related + * to this entity fails */ public void postRemoval(PersistenceStore store) { @@ -661,6 +661,7 @@ public long getExpiration() { + // TODO Findbugs return this.expiration; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/util/ojb/CSVtoCollectionFieldConversion.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -29,9 +29,7 @@ import org.apache.ojb.broker.accesslayer.conversions.FieldConversion; /** - *

- * ObjectRelationalBridge field conversion. - *

+ *

ObjectRelationalBridge field conversion.

* Converts from a comma-delimited field to a java.util.collection * * @author Scott T. Weaver @@ -73,7 +71,9 @@ // Spencer) // buffer.append(value.replaceAll("\"","\\\\\"")); - if (value != null && value.toString().indexOf("\"") >= 0) + // DONE Findbugs + // if (value != null && value.toString().indexOf("\"") >= 0) + if (value != null && value.indexOf("\"") >= 0) { // FieldConversionLog.LOG.error("The string '" + value + // "' contains embeded '\"'. It will not be converted to a Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/SwingParserAdaptor.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/SwingParserAdaptor.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/SwingParserAdaptor.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -115,6 +115,7 @@ * This Class is needed, because getParser is protected and therefore only * accessibly by a subclass */ + // TODO Findbugs class ParserGetter extends HTMLEditorKit { @@ -127,7 +128,6 @@ /* * Swing Parser Callback from the HTMLEditorKit. This class handles all * SAX-like events during parsing. - * */ class Callback extends HTMLEditorKit.ParserCallback { @@ -183,7 +183,6 @@ * @param tag The HTML tag being handled. @param attrs The mutable HTML * attribute set for the current HTML element. @param position the * position of the tag. - * */ public void handleSimpleTag(HTML.Tag htmlTag, MutableAttributeSet attrs, int param) @@ -230,7 +229,6 @@ * @param tag The HTML tag being handled. @param attrs The mutable HTML * attribute set for the current HTML element. @param position the * position of the tag. - * */ public void handleStartTag(HTML.Tag htmlTag, MutableAttributeSet attrs, int position) @@ -274,12 +272,14 @@ * * @param tag The HTML tag being handled. @param position the position * of the tag. - * */ public void handleEndTag(HTML.Tag htmlTag, int position) { String tag = htmlTag.toString(); - if (false == rewriter.enterEndTagEvent(tag.toString())) { return; } + // DONE Findbugs + // if (false == rewriter.enterEndTagEvent(tag.toString())) { return; + // } + if (false == rewriter.enterEndTagEvent(tag)) { return; } if (strip) { @@ -317,7 +317,6 @@ * * @param str The error message from Swing. @param param A parameter * passed to handler. - * */ public void handleError(java.lang.String str, int param) { @@ -329,7 +328,6 @@ * * @param values The character array of text comments. @param param A * parameter passed to handler. - * */ public void handleComment(char[] values, int param) { @@ -342,7 +340,6 @@ * Hot Java event callback for end of line strings. * * @param str The end-of-line string. - * */ public void handleEndOfLineString(java.lang.String str) { @@ -357,7 +354,6 @@ * debugging. * * @param tag The HTML tag being handled. - * */ private void formatLine(HTML.Tag tag) { @@ -383,8 +379,8 @@ * * @param txt Any text to be written out to stream with toString method. * The object being written should implement its toString method. - * @return A handle to the this, the callback, for chaining results. * + * @return A handle to the this, the callback, for chaining results. */ private Callback addToResult(Object txt) { @@ -408,8 +404,8 @@ * reference to itself so that these calls can be chained. * * @param txt Any character text to be written out directly to stream. - * @return A handle to the this, the callback, for chaining results. * + * @return A handle to the this, the callback, for chaining results. */ private Callback addToResult(char[] txt) { @@ -455,7 +451,6 @@ /* * Flushes the output stream. NOT IMPLEMENTED - * */ public void flush() throws javax.swing.text.BadLocationException { @@ -467,7 +462,6 @@ * * @param tag The HTML tag being output. @param attrs The mutable HTML * attribute set for the current HTML tag. - * */ private void appendTagToResult(HTML.Tag tag, MutableAttributeSet attrs) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/xml/SaxParserAdaptor.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/xml/SaxParserAdaptor.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/xml/SaxParserAdaptor.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -63,8 +63,11 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.syndication.services.crawler.rewriter.ParserAdaptor#parse(org.apache.jetspeed.syndication.services.crawler.rewriter.Rewriter, - * java.io.Reader) + * @see + * org.apache.jetspeed.syndication.services.crawler.rewriter.ParserAdaptor + * #parse + * (org.apache.jetspeed.syndication.services.crawler.rewriter.Rewriter, + * java.io.Reader) */ public void parse(Rewriter rewriter, Reader reader) throws RewriterException @@ -86,8 +89,11 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.syndication.services.crawler.rewriter.ParserAdaptor#rewrite(org.apache.jetspeed.syndication.services.crawler.rewriter.Rewriter, - * java.io.Reader, java.io.Writer) + * @see + * org.apache.jetspeed.syndication.services.crawler.rewriter.ParserAdaptor + * #rewrite + * (org.apache.jetspeed.syndication.services.crawler.rewriter.Rewriter, + * java.io.Reader, java.io.Writer) */ public void rewrite(Rewriter rewriter, Reader reader, Writer writer) throws RewriterException @@ -162,14 +168,17 @@ String tag = qName; if (false == rewriter - .enterStartTagEvent(tag.toString(), attributes)) return; + // DONE Findbugs + // .enterStartTagEvent(tag.toString(), attributes)) return; + .enterStartTagEvent(tag, attributes)) return; try { appendTagToResult(tag, attributes); write(lineSeparator); - String appended = rewriter.exitStartTagEvent(tag.toString(), - attributes); + // DONE Findbugs + // String appended = rewriter.exitStartTagEvent(tag.toString(), + String appended = rewriter.exitStartTagEvent(tag, attributes); if (null != appended) { write(appended); @@ -186,14 +195,18 @@ { String tag = qName; elementCount++; - if (false == rewriter.enterEndTagEvent(tag.toString())) return; + // DONE Findbugs + // if (false == rewriter.enterEndTagEvent(tag.toString())) return; + if (false == rewriter.enterEndTagEvent(tag)) return; try { addToResult(""); write(lineSeparator); - String appended = rewriter.exitEndTagEvent(tag.toString()); + // DONE Findbugs + // String appended = rewriter.exitEndTagEvent(tag.toString()); + String appended = rewriter.exitEndTagEvent(tag); if (null != appended) { write(appended); @@ -231,8 +244,8 @@ * * @param txt Any text to be written out to stream with toString method. * The object being written should implement its toString method. + * * @return A handle to the this, the callback, for chaining results. - * */ private SaxFormatHandler addToResult(Object txt) { @@ -265,7 +278,9 @@ private void convertURLS(String tag, MutableAttributes attrs) { - rewriter.enterConvertTagEvent(tag.toString(), attrs); + // DONE Findbugs + // rewriter.enterConvertTagEvent(tag.toString(), attrs); + rewriter.enterConvertTagEvent(tag, attrs); } public InputSource resolveEntity(String publicId, String systemId) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/search/src/java/org/apache/jetspeed/search/lucene/SearchEngineImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -96,7 +96,9 @@ } try { + // TODO Findbugs rootIndexDir.delete(); + // TODO Findbugs rootIndexDir.mkdirs(); IndexWriter indexWriter = new IndexWriter(rootIndexDir, @@ -618,13 +620,18 @@ { if (fields != null) { - Iterator keyIter = fields.keySet().iterator(); + // DONE Findbugs + // Iterator keyIter = fields.keySet().iterator(); + Iterator keyIter = fields.entrySet().iterator(); while (keyIter.hasNext()) { - Object key = keyIter.next(); + Map.Entry _entry = (Map.Entry) keyIter.next(); + // Object key = keyIter.next(); + Object key = _entry.getKey(); if (key != null) { - Object values = fields.get(key); + // Object values = fields.get(key); + Object values = _entry.getValue(); if (values != null) { if (values instanceof Collection) @@ -636,6 +643,7 @@ Object value = valueIter.next(); if (value != null) { + // TODO Findbugs if (type == TEXT) { doc.add(new Field(key.toString(), value @@ -653,6 +661,7 @@ } else { + // TODO Findbugs if (type == TEXT) { doc.add(new Field(key.toString(), values @@ -700,6 +709,7 @@ o.setFields(multiFields); o.setFields(fieldMap); } + // TODO Findbugs catch (Exception e) { // logger.error("Error trying to add fields to parsed object.", e); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapGroupSecurityHandler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapGroupSecurityHandler.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapGroupSecurityHandler.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -99,7 +99,9 @@ */ public void testRemoveNonExistantUserPrincipal() throws Exception { - String localUid = Integer.toString(rand.nextInt()).toString(); + // DONE Findbugs + // String localUid = Integer.toString(rand.nextInt()).toString(); + String localUid = Integer.toString(rand.nextInt()); GroupPrincipal localPrin = new GroupPrincipalImpl(localUid); grHandler.removeGroupPrincipal(localPrin); List groups = grHandler.getGroupPrincipals(""); @@ -125,7 +127,9 @@ assertTrue("List should have consisted of GroupPrincipal objects.", groups.get(0) instanceof GroupPrincipal); - String localUid = Integer.toString(rand.nextInt()).toString(); + // DONE Findbugs + // String localUid = Integer.toString(rand.nextInt()).toString(); + String localUid = Integer.toString(rand.nextInt()); assertTrue( "getGroupPrincipals should not have found any groups with the specified filter.", grHandler.getGroupPrincipals( Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapRoleSecurityHandler.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -97,7 +97,9 @@ */ public void testRemoveNonExistantUserPrincipal() throws Exception { - String localUid = Integer.toString(rand.nextInt()).toString(); + // DONE Findbugs + // String localUid = Integer.toString(rand.nextInt()).toString(); + String localUid = Integer.toString(rand.nextInt()); RolePrincipal localPrin = new RolePrincipalImpl(localUid); roleHandler.removeRolePrincipal(localPrin); List roles = roleHandler.getRolePrincipals(""); @@ -123,7 +125,9 @@ assertTrue("List should have consisted of RolePrincipal objects.", roles.get(0) instanceof RolePrincipal); - String localUid = Integer.toString(rand.nextInt()).toString(); + // DONE Findbugs + // String localUid = Integer.toString(rand.nextInt()).toString(); + String localUid = Integer.toString(rand.nextInt()); assertTrue( "getRolePrincipals should not have found any roles with the specified filter.", roleHandler.getRolePrincipals( Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapUserSecurityHandler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapUserSecurityHandler.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/test/org/apache/jetspeed/security/spi/ldap/TestLdapUserSecurityHandler.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -66,8 +66,11 @@ */ public void testUserIsNotPrincipal() throws Exception { + // DONE Findbugs + // assertFalse("User is principal and should not be.", userHandler + // .isUserPrincipal(Integer.toString(rand.nextInt()).toString())); assertFalse("User is principal and should not be.", userHandler - .isUserPrincipal(Integer.toString(rand.nextInt()).toString())); + .isUserPrincipal(Integer.toString(rand.nextInt()))); } /** @@ -113,7 +116,9 @@ */ public void testRemoveNonExistantUserPrincipal() throws Exception { - String localUid = Integer.toString(rand.nextInt()).toString(); + // DONE Findbugs + // String localUid = Integer.toString(rand.nextInt()).toString(); + String localUid = Integer.toString(rand.nextInt()); UserPrincipal localPrin = new UserPrincipalImpl(localUid); userHandler.removeUserPrincipal(localPrin); @@ -145,7 +150,9 @@ assertTrue("List should have consisted of Principal objects.", users.get(0) instanceof Principal); - String localUid = Integer.toString(rand.nextInt()).toString(); + // DONE Findbugs + // String localUid = Integer.toString(rand.nextInt()).toString(); + String localUid = Integer.toString(rand.nextInt()); assertTrue( "getUserPrincipals should not have found any users with the specified filter.", Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerBase.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -122,7 +122,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.serializer.JetspeedSerializer#nitializeComponentManager(String,String[],String[]) + * @see + * org.apache.jetspeed.serializer.JetspeedSerializer#nitializeComponentManager + * (String,String[],String[]) */ public final void initializeComponentManager(String appRoot, String[] bootConfig, String[] appConfig) throws SerializerException @@ -143,7 +145,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.serializer.JetspeedSerializer#setComponentManager(ComponentManager) + * @see + * org.apache.jetspeed.serializer.JetspeedSerializer#setComponentManager + * (ComponentManager) */ public final void setComponentManager(ComponentManager cm) { @@ -164,7 +168,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.serializer.JetspeedSerializer#setDefaultIndent(String) + * @see + * org.apache.jetspeed.serializer.JetspeedSerializer#setDefaultIndent(String + * ) */ public final void setDefaultIndent(String indent) { @@ -185,7 +191,7 @@ * (non-Javadoc) * * @see org.apache.jetspeed.serializer.JetspeedSerializer#importData(String, - * Map) + * Map) */ public final void importData(String importFileName, Map settings) throws SerializerException @@ -230,7 +236,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.serializer.JetspeedSerializer#exportData(String,String,Map) + * @see + * org.apache.jetspeed.serializer.JetspeedSerializer#exportData(String,String + * ,Map) */ public final void exportData(String name, String exportFileName, Map settings) throws SerializerException @@ -339,9 +347,12 @@ catch (Exception e) { e.printStackTrace(); - new SerializerException(SerializerException.FILE_PROCESSING_ERROR - .create(new String[] - {importFileName, e.getMessage()})); + // DONE Findbugs + // new SerializerException( + throw new SerializerException( + SerializerException.FILE_PROCESSING_ERROR + .create(new String[] + {importFileName, e.getMessage()})); } finally { @@ -399,6 +410,7 @@ SerializerException.FILE_BACKUP_FAILED .create(filename)); File ftemp = new File(backName); + // TODO Findbugs f.renameTo(ftemp); } } @@ -454,13 +466,18 @@ resetSettings(); /** process the new isntructionSet */ if ((settings == null) || (settings.size() == 0)) return; - Iterator _it = settings.keySet().iterator(); + // DONE Findbugs + // Iterator _it = settings.keySet().iterator(); + Iterator _it = settings.entrySet().iterator(); while (_it.hasNext()) { try { - String key = (String) _it.next(); - Object o = settings.get(key); + Map.Entry _entry = (Map.Entry) _it.next(); + String key = (String) _entry.getKey(); + // String key = (String) _it.next(); + // Object o = settings.get(key); + Object o = _entry.getValue(); if ((o != null) && (o instanceof Boolean)) setSetting(key, ((Boolean) o).booleanValue()); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedSerializerImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -721,15 +721,23 @@ HashMap map = attributes.getMyMap(); if (map != null) { - Iterator _itTemp = map.keySet().iterator(); + // DONE Findbugs + // Iterator _itTemp = map.keySet().iterator(); + Iterator _itTemp = map.entrySet().iterator(); while (_itTemp.hasNext()) { - String userAttrName = (String) _itTemp + Map.Entry _entry = (Map.Entry) _itTemp .next(); + String userAttrName = (String) _entry + .getKey(); + // String userAttrName = (String) _itTemp + // .next(); // if ( userAttributes.get(userAttrName, // "").equals("") - String userAttrValue = (String) map - .get(userAttrName); + String userAttrValue = (String) _entry + .getValue(); + // String userAttrValue = (String) map + // .get(userAttrName); userAttributes.put(userAttrName, userAttrValue); } @@ -863,8 +871,10 @@ { JSPermission _js = (JSPermission) list.next(); PortalResourcePermission perm = _js.getPermissionForType(); - if ((perm != null) - && (perm instanceof PortalResourcePermission)) + // if ((perm != null) + // && (perm instanceof PortalResourcePermission)) + // DONE Findbugs + if (perm != null) { try { @@ -1460,8 +1470,10 @@ JSCapability _jsC = new JSCapability(); _jsC.setName(_cp.getName()); this.capabilityMap.put(_jsC.getName(), _jsC); - this.capabilityMapInt.put(new Integer(_cp.getCapabilityId()), - _jsC); + // DONE Findbugs + // this.capabilityMapInt.put(new Integer(_cp.getCapabilityId()), + this.capabilityMapInt.put(Integer + .valueOf(_cp.getCapabilityId()), _jsC); ((JSSeedData) getSnapshot()).getCapabilities().add(_jsC); } catch (Exception e) @@ -1496,7 +1508,9 @@ JSMimeType _jsM = new JSMimeType(); _jsM.setName(_mt.getName()); this.mimeMap.put(_jsM.getName(), _jsM); - this.mimeMapInt.put(new Integer(_mt.getMimetypeId()), _jsM); + // DONE Findbugs + // this.mimeMapInt.put(new Integer(_mt.getMimetypeId()), _jsM); + this.mimeMapInt.put(Integer.valueOf(_mt.getMimetypeId()), _jsM); ((JSSeedData) getSnapshot()).getMimeTypes().add(_jsM); } @@ -1534,8 +1548,9 @@ JSMimeType _mt = (JSMimeType) mimeMap.get(_m.getName()); if (_mt != null) jsC.getMimeTypes().add(_mt); } - - Integer id = new Integer(c.getPreferredMimeTypeId()); + // DONE Findbugs + // Integer id = new Integer(c.getPreferredMimeTypeId()); + Integer id = Integer.valueOf(c.getPreferredMimeTypeId()); JSMimeType _mt = (JSMimeType) mimeMapInt.get(id); if (_mt != null) jsC.setPreferredMimeTypeID(_mt.getName()); @@ -2000,9 +2015,9 @@ * @param profiler * established profile manager * @param jsp - * deserialized object @ - * @throws SerializerException, - * ClassNotFoundException, ProfilerException + * deserialized object @ + * @throws SerializerException + * , ClassNotFoundException, ProfilerException */ protected ProfilingRule recreateRule(Profiler profiler, ProfilingRule existingRule, JSProfilingRule jsp) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSNVPElement.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -42,7 +42,9 @@ private static final XMLFormat XML = new XMLFormat(JSNVPElement.class) { - public boolean isReferencable() + // DONE Findbugs J2 + // public boolean isReferencable() + public boolean isReferenceable() { return false; // Always manipulates by value. } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/objects/JSRuleCriterion.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -67,9 +67,13 @@ xml.setAttribute("name", g.name); xml.add(g.type, "type", String.class); xml.add(g.value, "value", String.class); - xml.add(new Integer(g.fallBackOrder), "fallBackOrder", + // DONE Findbugs + // xml.add(new Integer(g.fallBackOrder), "fallBackOrder", + xml.add(Integer.valueOf(g.fallBackOrder), "fallBackOrder", Integer.class); - xml.add(new Integer(g.fallBackType), "fallBackType", + // DONE Findbugs + // xml.add(new Integer(g.fallBackType), "fallBackType", + xml.add(Integer.valueOf(g.fallBackType), "fallBackType", Integer.class); // xml.add(g.groupString); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/java/org/apache/jetspeed/sso/impl/PersistenceBrokerSSOProvider.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -95,8 +95,8 @@ * Location of repository mapping file. Must be available within * the classpath. * @param prefsFactoryImpl - * java.util.prefs.PreferencesFactory - * implementation to use. + * java.util.prefs.PreferencesFactory implementation + * to use. * @param enablePropertyManager * Whether or not we chould be suing the property manager. * @throws ClassNotFoundException @@ -113,7 +113,7 @@ * (non-Javadoc) * * @see org.apache.jetspeed.sso.SSOProvider#useSSO(java.lang.String, - * java.lang.String, java.lang.String) + * java.lang.String, java.lang.String) */ public String useSSO(Subject subject, String url, String SSOSite, boolean bRefresh) throws SSOException @@ -154,7 +154,7 @@ * (non-Javadoc) * * @see org.apache.jetspeed.sso.SSOProvider#useSSO(java.lang.String, - * java.lang.String) + * java.lang.String) */ public String useSSO(Subject subject, String url, boolean bRefresh) throws SSOException @@ -421,8 +421,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.sso.SSOProvider#hasSSOCredentials(javax.security.auth.Subject, - * java.lang.String) + * @see + * org.apache.jetspeed.sso.SSOProvider#hasSSOCredentials(javax.security. + * auth.Subject, java.lang.String) */ public boolean hasSSOCredentials(Subject subject, String site) { @@ -465,8 +466,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.sso.SSOProvider#getCredentials(javax.security.auth.Subject, - * java.lang.String) + * @see + * org.apache.jetspeed.sso.SSOProvider#getCredentials(javax.security.auth + * .Subject, java.lang.String) */ public SSOContext getCredentials(Subject subject, String site) throws SSOException @@ -502,8 +504,9 @@ * addCredential() Adds credentials for a user to the site. If the site * doesn't exist it will be created * - * @see org.apache.jetspeed.sso.SSOProvider#addCredentialsForSite(javax.security.auth.Subject, - * java.lang.String, java.lang.String) + * @see + * org.apache.jetspeed.sso.SSOProvider#addCredentialsForSite(javax.security + * .auth.Subject, java.lang.String, java.lang.String) */ public void addCredentialsForSite(Subject subject, String remoteUser, String site, String pwd) throws SSOException @@ -636,8 +639,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.sso.SSOProvider#removeCredentialsForSite(javax.security.auth.Subject, - * java.lang.String) + * @see + * org.apache.jetspeed.sso.SSOProvider#removeCredentialsForSite(javax.security + * .auth.Subject, java.lang.String) */ public void removeCredentialsForSite(Subject subject, String site) throws SSOException @@ -799,7 +803,6 @@ /* * Helper utilities - * */ /* @@ -914,7 +917,9 @@ if (ix != -1) name = fullPath.substring(ix + 1); else - name = new String(fullPath); + // DONE Findbugs + // name = new String(fullPath); + name = fullPath; return name; } @@ -994,26 +999,27 @@ * * @param site * @param fullPath - * @return + * @return removes remotePrincipal for a site & principal * - * removes remotePrincipal for a site & principal + * private InternalUserPrincipal + * removeRemotePrincipalForPrincipal(SSOSite site, String fullPath) + * throws SSOException { if (site.getPrincipals() != null) { + * Iterator itPrincipals = site.getPrincipals().iterator(); while + * (itPrincipals.hasNext()) { SSOPrincipal tmp = + * (SSOPrincipal)itPrincipals.next(); if + * (tmp.getFullPath().compareToIgnoreCase(fullPath) == 0) { // Found + * -- get the remotePrincipal Collection collRemotePrincipals = + * tmp.getRemotePrincipals() ; if (collRemotePrincipals != null) { * - * private InternalUserPrincipal removeRemotePrincipalForPrincipal(SSOSite - * site, String fullPath) throws SSOException { if (site.getPrincipals() != - * null) { Iterator itPrincipals = site.getPrincipals().iterator(); while - * (itPrincipals.hasNext()) { SSOPrincipal tmp = - * (SSOPrincipal)itPrincipals.next(); if - * (tmp.getFullPath().compareToIgnoreCase(fullPath) == 0) { // Found -- get - * the remotePrincipal Collection collRemotePrincipals = - * tmp.getRemotePrincipals() ; if (collRemotePrincipals != null) { + * Iterator itRemotePrincipals = collRemotePrincipals.iterator(); if + * (itRemotePrincipals.hasNext()) { InternalUserPrincipal + * remotePrincipal = + * (InternalUserPrincipal)itRemotePrincipals.next(); // Found remove + * the object collRemotePrincipals.remove(remotePrincipal); return + * remotePrincipal; } } } } } * - * Iterator itRemotePrincipals = collRemotePrincipals.iterator(); if - * (itRemotePrincipals.hasNext()) { InternalUserPrincipal remotePrincipal = - * (InternalUserPrincipal)itRemotePrincipals.next(); // Found remove the - * object collRemotePrincipals.remove(remotePrincipal); return - * remotePrincipal; } } } } } - * - * throw new SSOException(SSOException.REQUESTED_PRINCIPAL_DOES_NOT_EXIST); } + * throw new + * SSOException(SSOException.REQUESTED_PRINCIPAL_DOES_NOT_EXIST); } */ /* @@ -1447,7 +1453,8 @@ // try // { // bis = new - // BufferedInputStream(get.getResponseBodyAsStream()); + // BufferedInputStream(get. + // getResponseBodyAsStream()); resultPage = get .getResponseBodyAsString(); // } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -208,6 +208,7 @@ if (record instanceof PortletLogRecord) { + // TODO Findbugs if (portletBatch == null) { synchronized (this) @@ -272,25 +273,40 @@ { PortletLogRecord rec = (PortletLogRecord) record; Object[] args1 = - {rec.getIpAddress(), "-", rec.getUserName(), rec.getTimeStamp(), - rec.getLogType(), formatter.format(rec.getTimeStamp()), + {rec.getIpAddress(), "-", rec.getUserName(), + rec.getTimeStamp(), + rec.getLogType(), + formatter.format(rec.getTimeStamp()), rec.getPortletName(), - new Integer(rec.getStatus()).toString(), - new Long(rec.getMsElapsedTime())}; + // DONE Findbugs + // new Integer(rec.getStatus()).toString(), + // new Long(rec.getMsElapsedTime())}; + Integer.valueOf(rec.getStatus()).toString(), + Long.valueOf(rec.getMsElapsedTime())}; + args = args1; - logMessage = MessageFormat.format(portletLogFormat, args) - .toString(); + logMessage = MessageFormat.format(portletLogFormat, args); + // Done + // .toString(); } if (record instanceof PageLogRecord) { PageLogRecord rec = (PageLogRecord) record; Object[] args1 = - {rec.getIpAddress(), "-", rec.getUserName(), rec.getTimeStamp(), - rec.getLogType(), formatter.format(rec.getTimeStamp()), - new Integer(rec.getStatus()).toString(), - new Long(rec.getMsElapsedTime())}; + {rec.getIpAddress(), "-", rec.getUserName(), + rec.getTimeStamp(), + rec.getLogType(), + formatter.format(rec.getTimeStamp()), + // DONE Findbugs + // new Integer(rec.getStatus()).toString(), + // new Long(rec.getMsElapsedTime())}; + Integer.valueOf(rec.getStatus()).toString(), + Long.valueOf(rec.getMsElapsedTime())}; args = args1; - logMessage = MessageFormat.format(pageLogFormat, args).toString(); + // DONE Findbugs + // logMessage = MessageFormat.format(pageLogFormat, + // args).toString(); + logMessage = MessageFormat.format(pageLogFormat, args); } if (record instanceof UserLogRecord) { @@ -415,8 +431,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.statistics.PortalStatistics#logUserLogin(org.apache.jetspeed.request.RequestContext, - * long) + * @see + * org.apache.jetspeed.statistics.PortalStatistics#logUserLogin(org.apache + * .jetspeed.request.RequestContext, long) */ public void logUserLogin(RequestContext request, long msElapsedLoginTime) { @@ -497,6 +514,7 @@ portletBatch.tellThreadToStop(); synchronized (portletBatch.thread) { + // TODO Findbugs portletBatch.thread.notify(); } @@ -506,6 +524,7 @@ userBatch.tellThreadToStop(); synchronized (userBatch.thread) { + // TODO Findbugs userBatch.thread.notify(); } } @@ -514,6 +533,7 @@ pageBatch.tellThreadToStop(); synchronized (pageBatch.thread) { + // TODO Findbugs pageBatch.thread.notify(); } } @@ -618,7 +638,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.statistics.PortalStatistics#getDefaultEmptyStatisticsQueryCriteria() + * @seeorg.apache.jetspeed.statistics.PortalStatistics# + * getDefaultEmptyStatisticsQueryCriteria() */ public StatisticsQueryCriteria createStatisticsQueryCriteria() { @@ -628,7 +649,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.statistics.PortalStatistics#getDefaultEmptyAggregateStatistics() + * @seeorg.apache.jetspeed.statistics.PortalStatistics# + * getDefaultEmptyAggregateStatistics() */ public AggregateStatistics getDefaultEmptyAggregateStatistics() { @@ -705,6 +727,7 @@ try { con = ds.getConnection(); + // TODO Findbugs PreparedStatement pstmt = con.prepareStatement(query); pstmt.setTimestamp(1, new Timestamp(start.getTime())); pstmt.setTimestamp(2, new Timestamp(end.getTime())); @@ -724,6 +747,7 @@ as.setMaxProcessingTime(rs.getFloat("amax") / denominator); } + // TODO Findbugs PreparedStatement pstmt2 = con.prepareStatement(query2); pstmt2.setTimestamp(1, new Timestamp(start.getTime())); pstmt2.setTimestamp(2, new Timestamp(end.getTime())); @@ -797,14 +821,17 @@ protected String floatFormatter(float f) { // for now we'll just truncate as int - int f2 = new Float(f).intValue(); + // DONE Findbugs + // int f2 = new Float(f).intValue(); + int f2 = (int) f; return Integer.toString(f2); } /* * (non-Javadoc) * - * @see org.apache.jetspeed.statistics.PortalStatistics#getListOfLoggedInUsers() + * @see + * org.apache.jetspeed.statistics.PortalStatistics#getListOfLoggedInUsers() */ public List getListOfLoggedInUsers() { @@ -820,7 +847,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.statistics.PortalStatistics#getNumberOfLoggedInUsers() + * @see + * org.apache.jetspeed.statistics.PortalStatistics#getNumberOfLoggedInUsers + * () */ public int getNumberOfLoggedInUsers() { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/JetspeedActions.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -133,17 +133,33 @@ actionsMap = new HashMap(); - actionsMap.put(WindowState.MINIMIZED.toString(), new Integer(index++)); + // actionsMap.put(WindowState.MINIMIZED.toString(), new + // Integer(index++)); + // DONE Findbugs + actionsMap.put(WindowState.MINIMIZED.toString(), Integer + .valueOf(index++)); actionsList.add(WindowState.MINIMIZED); - actionsMap.put(WindowState.MAXIMIZED.toString(), new Integer(index++)); + // actionsMap.put(WindowState.MAXIMIZED.toString(), new + // Integer(index++)); + // DONE Findbugs + actionsMap.put(WindowState.MAXIMIZED.toString(), Integer + .valueOf(index++)); actionsList.add(WindowState.MAXIMIZED); - actionsMap.put(WindowState.NORMAL.toString(), new Integer(index++)); + // actionsMap.put(WindowState.NORMAL.toString(), new Integer(index++)); + // DONE Findbugs + actionsMap.put(WindowState.NORMAL.toString(), Integer.valueOf(index++)); actionsList.add(WindowState.NORMAL); - actionsMap.put(PortletMode.VIEW.toString(), new Integer(index++)); + // actionsMap.put(PortletMode.VIEW.toString(), new Integer(index++)); + // DONE Findbugs + actionsMap.put(PortletMode.VIEW.toString(), Integer.valueOf(index++)); actionsList.add(PortletMode.VIEW); - actionsMap.put(PortletMode.EDIT.toString(), new Integer(index++)); + // actionsMap.put(PortletMode.EDIT.toString(), new Integer(index++)); + // DONE Findbugs + actionsMap.put(PortletMode.EDIT.toString(), Integer.valueOf(index++)); actionsList.add(PortletMode.EDIT); - actionsMap.put(PortletMode.HELP.toString(), new Integer(index++)); + // actionsMap.put(PortletMode.HELP.toString(), new Integer(index++)); + // DONE Findbugs + actionsMap.put(PortletMode.HELP.toString(), Integer.valueOf(index++)); actionsList.add(PortletMode.HELP); ArrayList list = new ArrayList(); @@ -184,6 +200,7 @@ actions = actionsList.toArray(); + // TODO Findbugs instance = this; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/login/LoginConstants.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -37,15 +37,27 @@ public final static String LOGIN_CHECK = "org.apache.jetspeed.login.check"; - public final static Integer ERROR_UNKNOWN_USER = new Integer(1); + // DONE Findbugs + // public final static Integer ERROR_UNKNOWN_USER = new Integer(1); + public final static Integer ERROR_UNKNOWN_USER = Integer.valueOf(1); - public final static Integer ERROR_INVALID_PASSWORD = new Integer(2); + // DONE Findbugs + // public final static Integer ERROR_INVALID_PASSWORD = new Integer(2); + public final static Integer ERROR_INVALID_PASSWORD = Integer.valueOf(2); - public final static Integer ERROR_USER_DISABLED = new Integer(3); + // DONE Findbugs + // public final static Integer ERROR_USER_DISABLED = new Integer(3); + public final static Integer ERROR_USER_DISABLED = Integer.valueOf(3); - public final static Integer ERROR_FINAL_LOGIN_ATTEMPT = new Integer(4); + // DONE Findbugs + // public final static Integer ERROR_FINAL_LOGIN_ATTEMPT = new Integer(4); + public final static Integer ERROR_FINAL_LOGIN_ATTEMPT = Integer.valueOf(4); - public final static Integer ERROR_CREDENTIAL_DISABLED = new Integer(5); + // DONE Findbugs + // public final static Integer ERROR_CREDENTIAL_DISABLED = new Integer(5); + public final static Integer ERROR_CREDENTIAL_DISABLED = Integer.valueOf(5); - public final static Integer ERROR_CREDENTIAL_EXPIRED = new Integer(6); + // DONE Findbugs + // public final static Integer ERROR_CREDENTIAL_EXPIRED = new Integer(6); + public final static Integer ERROR_CREDENTIAL_EXPIRED = Integer.valueOf(6); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/MultiColumnPortlet.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -206,12 +206,16 @@ // invoke the JSP associated with this portlet request.setAttribute("columnLayout", layout); - request.setAttribute("numberOfColumns", new Integer(numColumns)); + // request.setAttribute("numberOfColumns", new Integer(numColumns)); + // DONE Findbugs + request.setAttribute("numberOfColumns", Integer.valueOf(numColumns)); request.setAttribute("decorationFactory", this.decorators); request.setAttribute("columnSizes", fragmentColumnSizesList); request.setAttribute("editing", editing); - request.setAttribute("fragmentNestingLevel", new Integer( - getFragmentNestingLevel(requestPage, f.getId()))); + // DONE Findbugs + // request.setAttribute("fragmentNestingLevel", new Integer( + request.setAttribute("fragmentNestingLevel", Integer + .valueOf(getFragmentNestingLevel(requestPage, f.getId()))); super.doView(request, response); request.removeAttribute("decorationFactory"); request.removeAttribute("columnLayout"); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/util/ResourceBundleFactory.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/util/ResourceBundleFactory.java 2008-07-08 08:24:06 UTC (rev 1019) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/util/ResourceBundleFactory.java 2008-07-09 10:14:13 UTC (rev 1020) @@ -62,10 +62,13 @@ "The resource directory cannot be parsed as a URL: " + resourceDirName, resourceName + "_" + locale, ""); } + // TODO Findbugs ResourceBundle resourceBundle = ResourceBundle.getBundle(resourceName, locale, new URLClassLoader(urls)); resource = new ArrayList(2); - resource.add(0, new Long(now)); + // resource.add(0, new Long(now)); + // DONE Findbugs + resource.add(0, Long.valueOf(now)); resource.add(1, resourceBundle); resourceBundleCache.put(resourceKey, resource); return resourceBundle; From svnnotify ¡÷ sourceforge.jp Wed Jul 9 19:15:05 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 09 Jul 2008 19:15:05 +0900 Subject: [pal-cvs 3287] [1021] Findbug 'TODO' Message-ID: <1215598505.735483.18249.nullmailer@users.sourceforge.jp> Revision: 1021 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1021 Author: sone Date: 2008-07-09 19:15:05 +0900 (Wed, 09 Jul 2008) Log Message: ----------- Findbug 'TODO' Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/JetspeedSecurityService.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/LoginModule.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/Log.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/LogFactory.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/portlets/layout/LayoutEvent.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/services/JetspeedPortletServices.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/DirectoryHelper.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/JarHelper.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/Path.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/ClientImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MediaTypeImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheEventListener.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/cache/TestContentCache.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/cache/TestDecorationContentCache.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobEntry.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedLocatorDescriptor.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateDescriptor.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareCollection.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareList.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/redirect/impl/SSLRedirectValveImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/servlet/UserManagerServlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/CommonjWorkerMonitorImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/ajax/AJAXRequestImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/DesktopPortletContainerImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/PageHistoryValve.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/BaseDecoration.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JarExpander.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/HttpSessionWrapper.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LogoutServlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/Jetspeed1CredentialPasswordEncoder.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/CloneUtil.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/MimeType.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/window/TestWindows.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuSeparatorImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/om/impl/NodeImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/DomainCriterionResolver.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RuleCriterionImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1b.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/search/src/test/org/apache/jetspeed/search/TestSearch.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/LoginModuleProxyImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserPrincipalImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalCredentialImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalGroupPrincipalImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalPermissionImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalRolePrincipalImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalUserPrincipalImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapContextProxy.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/util/GullibleSSLSocketFactory.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedDDLApplication.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/test/org/apache/jetspeed/audit/TestAuditActivity.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentResource.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/IsolatedLog4JLogger.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/Log4JConfigurator.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/PortalContext.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/i18n/KeyedMessage.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/BaseSecurityReference.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/taglibs/treecontrol/src/java/org/apache/webapp/admin/TreeControl.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/ant-tasks/src/java/org/apache/jetspeed/anttasks/ArchetypeDescriptor.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -201,6 +201,7 @@ File destDir = destFile.getParentFile(); if (!destDir.exists()) { + // TODO Findbugs destDir.mkdirs(); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/JetspeedSecurityService.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/JetspeedSecurityService.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/JetspeedSecurityService.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -36,6 +36,7 @@ public class JetspeedSecurityService implements JetspeedSecurityServiceMBean { + // TODO Findbugs private final String JCD_ALIAS = "JetspeedSecurityServiceDS"; private GenericApplicationContext ctx; @@ -79,8 +80,8 @@ } /** - * Set the JNDI name of the DataSource to be used to access - * the database. + * Set the JNDI name of the DataSource to be used to access the + * database. * * @param jndiName */ Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/LoginModule.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/LoginModule.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/LoginModule.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -36,6 +36,7 @@ * A login module that uses the JetspeedSecurityService MBean for authentication * and role assignment. */ +// TODO Findbugs public class LoginModule implements javax.security.auth.spi.LoginModule { @@ -45,16 +46,17 @@ /** * Helper for delaying the creation of the JBossLoginModule. We cannot - * access the security service MBean before initialize has - * been called, but need the user manager in the constructor of - * JBossLoginModule. The constructor that takes the user manager as argument - * is protected (and right so), so we need this helper. + * access the security service MBean before initialize has been + * called, but need the user manager in the constructor of JBossLoginModule. + * The constructor that takes the user manager as argument is protected (and + * right so), so we need this helper. */ private class LoginModuleDelegee extends JBossLoginModule { public LoginModuleDelegee(UserManager userManager) { + // TODO Findbugs super(userManager); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/Log.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/Log.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/Log.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -13,6 +13,7 @@ private ResourceBundle resourceBundle; + // TODO Findbugs public Log(org.apache.commons.logging.Log log, ResourceBundle resourceBundle) { this.log = log; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/LogFactory.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/LogFactory.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/jp/sf/pal/portal/logging/LogFactory.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -7,6 +7,7 @@ public class LogFactory { + // TODO Findbugs protected static ResourceBundle resourceBundle = ResourceBundle .getBundle("jp.sf.pal.portal.logging.resources.Messages"); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/container/JetspeedContainerServlet.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -61,6 +61,7 @@ private boolean started = false; + // TODO Findbugs private Timer startTimer = null; private PortalSessionsManager psm; @@ -172,6 +173,7 @@ + ". Starting back ground thread to start when the portal comes online."; context.log(START_DELAYED_MSG); startTimer = new Timer(true); + // TODO Findbugs startTimer.schedule(new TimerTask() { @@ -479,6 +481,7 @@ startTimer.cancel(); startTimer = null; } + // TODO Findbugs else if (started) { started = false; @@ -504,6 +507,7 @@ } } contextName = null; + // TODO Findbugs psm = null; } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/dispatcher/JetspeedRequestDispatcher.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -35,7 +35,8 @@ * Implements the Portlet API Request Dispatcher to dispatch to portlets * * @author David Sean Taylor - * @version $Id: JetspeedRequestDispatcher.java 516448 2007-03-09 16:25:47Z ate $ + * @version $Id: JetspeedRequestDispatcher.java 516448 2007-03-09 16:25:47Z ate + * $ */ public class JetspeedRequestDispatcher implements PortletRequestDispatcher { @@ -98,6 +99,7 @@ // propagated back Throwable rootCause = null; + // TODO Findbugs if (e instanceof ServletException) { rootCause = ((ServletException) e).getRootCause(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/portlets/layout/LayoutEvent.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/portlets/layout/LayoutEvent.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/portlets/layout/LayoutEvent.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -21,8 +21,7 @@ /** * A LayoutEvent is used by ColumnLayout to notify its LayoutAeventListeners * that there have been a change in the position of a fragment within the - * layout. - *

Constant Values

+ * layout.

Constant Values

*
    *
  • ADDED == 0
    • *
  • MOVED_UP == 1
    • @@ -136,6 +135,7 @@ public boolean equals(Object obj) { + // TODO Findbugs if (obj instanceof LayoutEvent) { LayoutEvent event = (LayoutEvent) obj; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/services/JetspeedPortletServices.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/services/JetspeedPortletServices.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/services/JetspeedPortletServices.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -49,6 +49,7 @@ public JetspeedPortletServices(Map services) { + // TODO Findbugs singleton = this; this.services = services; } @@ -56,8 +57,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.components.PortletServices#addPortletService(java.lang.String, - * java.lang.Object) + * @see + * org.apache.jetspeed.components.PortletServices#addPortletService(java + * .lang.String, java.lang.Object) */ public void addPortletService(String serviceName, Object service) { @@ -67,7 +69,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.components.PortletServices#getService(java.lang.String) + * @see + * org.apache.jetspeed.components.PortletServices#getService(java.lang.String + * ) */ public Object getService(String serviceName) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/DirectoryHelper.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/DirectoryHelper.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/DirectoryHelper.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -42,6 +42,7 @@ super(); if (!directory.exists()) { + // TODO Findbugs directory.mkdirs(); } @@ -121,6 +122,7 @@ if (child.isFile()) { File toFile = new File(dstDir, child.getName()); + // TODO Findbugs toFile.createNewFile(); srcChannel = new FileInputStream(child).getChannel(); dstChannel = new FileOutputStream(toFile).getChannel(); @@ -131,6 +133,7 @@ else { File newSubDir = new File(dstDir, child.getName()); + // TODO Findbugs newSubDir.mkdir(); copyFiles(child, newSubDir, fileFilter); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/JarHelper.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/JarHelper.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/JarHelper.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -30,9 +30,9 @@ /** * @author Scott T. Weaver * - * Creates a a temp directory to which a JarFile is expanded and can be - * manipulated. All operations are performed by an internal instance of - * {@link DirectoryHelper}. + * Creates a a temp directory to which a JarFile is expanded and can be + * manipulated. All operations are performed by an internal instance of + * {@link DirectoryHelper}. * */ public class JarHelper extends AbstractFileSystemHelper implements @@ -67,6 +67,7 @@ if (!jarRoot.exists()) { + // TODO Findbugs jarRoot.mkdirs(); } jarRoot.deleteOnExit(); @@ -79,6 +80,7 @@ if (jarEntry.isDirectory()) { File newDir = new File(jarRoot, name); + // TODO Findbugs newDir.mkdir(); newDir.deleteOnExit(); } @@ -109,9 +111,11 @@ File file = new File(jarRoot, name); if (!file.getParentFile().exists()) { + // TODO Findbugs file.getParentFile().mkdirs(); file.getParentFile().deleteOnExit(); } + // TODO Findbugs file.createNewFile(); file.deleteOnExit(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/Path.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/Path.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/commons/src/java/org/apache/jetspeed/util/Path.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -29,28 +29,28 @@ *

    Rules for Interperting Pathes

    *

    * Below are the rules for how the constructor interprets literal paths. - * NOTE the {@link addSegment(String)} interprets string - * pathes in a somewhat different manner.

A A B C D + + + + - Edit - Delete + +
+ * NOTE the {@link addSegment(String)} interprets string pathes + * in a somewhat different manner. + *
* * * * - * + * * + * This means that the baseName will be set to index and the + * fileExtension will be set to .html * - * + * * - - + + - - + + - - + + - - + +
Literal PathInterpretation
/foo/bar/index.html /foo/bar/index.html foo and bar will be considered directory * segments while index.html will be considered a file segment. - * This means that the baseName will be set to index and - * the fileExtension will be set to .html
/foo/bar/, /foo/bar, foo/bar/ foo/bar - * /foo/bar/, /foo/bar, foo/bar/ foo/bar *

- * foo and bar will be considered directory - * segments. baseName and fileExtension will be - * left as null. + * foo and bar will be considered directory segments. + * baseName and fileExtension will be left as + * null. *

- * I cases where a file has no extension you must use the - * {@link setFileSegment(String))} to manually set the file. This causes the + * I cases where a file has no extension you must use the {@link + * setFileSegment(String))} to manually set the file. This causes the * baseName to be set to the file name specified and the * fileExtension will be set to the empty string (""). *

@@ -60,6 +60,7 @@ * * @author Scott T. Weaver */ +// TODO Findbugs public class Path implements Serializable, Cloneable { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/ClientImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/ClientImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/ClientImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -64,10 +64,12 @@ */ public boolean equals(Object object) { + // TODO Findbugs if (object == this) return true; if (object == null) { return false; } + // TODO Findbugs ClientImpl obj = (ClientImpl) object; if (name != null) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MediaTypeImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MediaTypeImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/capability/src/java/org/apache/jetspeed/capabilities/impl/MediaTypeImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -55,6 +55,7 @@ public MediaTypeImpl(long id, String name, int _hidden, String mimeType, String title, String description, String image, String role) { + // TODO Findbugs this.mimetypes.add(mimeType); } @@ -64,9 +65,11 @@ */ public boolean equals(Object object) { + // TODO Findbugs if (this == object) return true; if (object == null) return false; + // TODO Findbugs MediaTypeImpl obj = (MediaTypeImpl) object; if (this.name != null) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -129,6 +129,7 @@ public Object clone() throws CloneNotSupportedException { + // TODO Findbugs return null; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheEventListener.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheEventListener.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheEventListener.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -26,6 +26,7 @@ public Object clone() throws CloneNotSupportedException { + // TODO Findbugs return null; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -140,6 +140,7 @@ public Object clone() throws CloneNotSupportedException { + // TODO Findbugs return super.clone(); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/cache/TestContentCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/cache/TestContentCache.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/cache/TestContentCache.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -259,6 +259,7 @@ private String name; + // TODO Findbugs public MockPrincipal(String name) { this.name = name; @@ -273,6 +274,7 @@ class MockPortletContent implements PortletContent { + // TODO Findbugs private boolean complete = false; private ContentCacheKey cacheKey; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/cache/TestDecorationContentCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/cache/TestDecorationContentCache.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/cm/src/test/org/apache/jetspeed/cache/TestDecorationContentCache.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -250,6 +250,7 @@ private String name; + // TODO Findbugs public MockPrincipal(String name) { this.name = name; @@ -266,6 +267,7 @@ private String pageId; + // TODO Findbugs public MockTheme(String pageId) { this.pageId = pageId; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/deploy-tool/src/java/org/apache/jetspeed/tools/deploy/JetspeedDeploy.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -240,6 +240,7 @@ srcChannel = null; dstChannel.close(); dstChannel = null; + // TODO Findbugs tempFile.delete(); tempFile = null; System.out.println("War " + outputName + " created"); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/file-cache/src/test/org/apache/jetspeed/cache/file/TestFileCache.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -51,8 +51,8 @@ /** * Creates the test suite. * - * @return a test suite (TestSuite) that includes all - * methods starting with "test" + * @return a test suite (TestSuite) that includes all methods + * starting with "test" */ public static Test suite() { @@ -146,6 +146,7 @@ .getCanonicalPath()); assertNotNull(stuff); + // TODO Findbugs files[18].setLastModified(new Date().getTime()); Thread.sleep(9000); @@ -161,6 +162,7 @@ removeTestFiles(); } + // TODO Findbugs catch (Exception e) { fail(ExceptionUtils.getStackTrace(e)); @@ -186,6 +188,7 @@ { String testFile = TEST_DIRECTORY + "/testFile-" + ix + ".psml"; File file = new File(testFile); + // TODO Findbugs if (file.exists()) file.delete(); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobEntry.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobEntry.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/JobEntry.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -58,8 +58,8 @@ * * Schedule a job to run on a certain point of time.
* - * Example 1: Run the DefaultScheduledJob at 8:00am every 15th of the month - - *
+ * Example 1: Run the DefaultScheduledJob at 8:00am every 15th of the month + * -
* * JobEntry je = new JobEntry(0,0,8,15,"DefaultScheduledJob");
* @@ -87,8 +87,8 @@ * Value for entry "month days". * @param task * Task to execute. - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ public JobEntry(int sec, int min, int hour, int wd, int day_mo, String task) throws Exception @@ -111,6 +111,7 @@ */ public int compareTo(Object je) { + // TODO Findbugs int result = -1; if (je instanceof JobEntry) { @@ -182,8 +183,8 @@ * 3. Calculate the diff in time between the current time and the next run * time.
* - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ public void calcRunTime() throws Exception { @@ -276,8 +277,8 @@ * please jump in! * * @return A number specifying the type of schedule. See calcRunTime(). - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ private int evaluateJobType() throws Exception { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -65,8 +65,8 @@ /** * Constructor. * - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ public MemoryBasedScheduler(Configuration config) throws Exception { @@ -85,6 +85,7 @@ { super.start(); scheduleQueue = new JobQueue(); + // TODO Findbugs mainLoop = new MainLoop(); List jobProps = getConfiguration().getList("jobs"); @@ -147,8 +148,8 @@ * @param oid * The int id for the job. * @return A JobEntry. - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ public JobEntry getJob(int oid) throws Exception { @@ -161,8 +162,8 @@ * * @param je * A JobEntry with the job to add. - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ public void addJob(JobEntry je) throws Exception { @@ -176,8 +177,8 @@ * * @param je * A JobEntry with the job to remove. - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ public void removeJob(JobEntry je) throws Exception { @@ -191,8 +192,8 @@ * * @param je * A JobEntry with the job to modify - * @exception Exception, - * a generic exception. + * @exception Exception + * , a generic exception. */ public void updateJob(JobEntry je) throws Exception { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedLocatorDescriptor.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedLocatorDescriptor.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedLocatorDescriptor.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -20,7 +20,8 @@ * Jetspeed default Locator Descriptor implementation * * @author David Sean Taylor - * @version $Id: JetspeedLocatorDescriptor.java 516448 2007-03-09 16:25:47Z ate $ + * @version $Id: JetspeedLocatorDescriptor.java 516448 2007-03-09 16:25:47Z ate + * $ */ public class JetspeedLocatorDescriptor implements LocatorDescriptor { @@ -147,7 +148,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.cps.template.TemplateLocator#setType(java.lang.String) + * @see + * org.apache.jetspeed.cps.template.TemplateLocator#setType(java.lang.String + * ) */ public void setType(String type) { @@ -167,7 +170,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.cps.template.TemplateLocator#setName(java.lang.String) + * @see + * org.apache.jetspeed.cps.template.TemplateLocator#setName(java.lang.String + * ) */ public void setName(String name) { @@ -187,7 +192,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.cps.template.TemplateLocator#setMediaType(java.lang.String) + * @see + * org.apache.jetspeed.cps.template.TemplateLocator#setMediaType(java.lang + * .String) */ public void setMediaType(String mediaType) { @@ -207,7 +214,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.cps.template.TemplateLocator#setLanguage(java.lang.String) + * @see + * org.apache.jetspeed.cps.template.TemplateLocator#setLanguage(java.lang + * .String) */ public void setLanguage(String language) { @@ -227,7 +236,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.cps.template.TemplateLocator#setCountry(java.lang.String) + * @see + * org.apache.jetspeed.cps.template.TemplateLocator#setCountry(java.lang + * .String) */ public void setCountry(String country) { @@ -240,6 +251,7 @@ */ public Object clone() throws java.lang.CloneNotSupportedException { + // TODO Findbugs return super.clone(); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateDescriptor.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateDescriptor.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateDescriptor.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -22,7 +22,8 @@ * Jetspeed default Template Descriptor implementation * * @author David Sean Taylor - * @version $Id: JetspeedTemplateDescriptor.java 516448 2007-03-09 16:25:47Z ate $ + * @version $Id: JetspeedTemplateDescriptor.java 516448 2007-03-09 16:25:47Z ate + * $ */ public class JetspeedTemplateDescriptor extends JetspeedLocatorDescriptor implements TemplateDescriptor @@ -59,7 +60,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.cps.template.Template#setAbsolutePath(java.lang.String) + * @see + * org.apache.jetspeed.cps.template.Template#setAbsolutePath(java.lang.String + * ) */ public void setAbsolutePath(String path) { @@ -72,6 +75,7 @@ */ public Object clone() throws java.lang.CloneNotSupportedException { + // TODO Findbugs return super.clone(); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -130,7 +130,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.folder.Folder#getEffectiveDefaultDecorator(java.lang.String) + * @see + * org.apache.jetspeed.om.folder.Folder#getEffectiveDefaultDecorator(java + * .lang.String) */ public String getEffectiveDefaultDecorator(String fragmentType) { @@ -149,7 +151,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.folder.Folder#getDefaultDecorator(java.lang.String) + * @see + * org.apache.jetspeed.om.folder.Folder#getDefaultDecorator(java.lang.String + * ) */ public String getDefaultDecorator(String fragmentType) { @@ -159,8 +163,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.folder.Folder#setDefaultDecorator(java.lang.String, - * java.lang.String) + * @see + * org.apache.jetspeed.om.folder.Folder#setDefaultDecorator(java.lang.String + * , java.lang.String) */ public void setDefaultDecorator(String decoratorName, String fragmentType) { @@ -180,7 +185,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.folder.Folder#setDocumentOrder(java.util.List) + * @see + * org.apache.jetspeed.om.folder.Folder#setDocumentOrder(java.util.List) */ public void setDocumentOrder(List docIndexes) { @@ -660,6 +666,7 @@ */ public void setFolderHandler(FolderHandler handler) { + // TODO Findbugs this.folderHandler = handler; } @@ -886,6 +893,7 @@ */ public void reset() { + // TODO Findbugs allNodes = null; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -41,6 +41,7 @@ public static final String DOCUMENT_TYPE = "folder.metadata"; + // TODO Findbugs private DefaultsImpl defaults = new DefaultsImpl(); private List docOrder; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -122,6 +122,7 @@ try { log.debug("Waiting on content for Fragment " + getId()); + // TODO Findbugs portletContent.wait(); return portletContent.getContent(); } @@ -147,7 +148,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.ContentFragment#overrideRenderedContent(java.lang.String) + * @see + * org.apache.jetspeed.om.page.ContentFragment#overrideRenderedContent(java + * .lang.String) */ public void overrideRenderedContent(String contnent) { @@ -169,7 +172,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.ContentFragment#setPortletContent(org.apache.jetspeed.aggregator.PortletContent) + * @see + * org.apache.jetspeed.om.page.ContentFragment#setPortletContent(org.apache + * .jetspeed.aggregator.PortletContent) */ public void setPortletContent(PortletContent portletContent) { @@ -223,7 +228,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String) */ public int getIntProperty(String propName) { @@ -234,7 +240,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String) */ public float getFloatProperty(String propName) { @@ -422,7 +429,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String) */ public void setLayoutSizes(String sizes) { @@ -559,7 +567,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.BaseElement#setShortTitle(java.lang.String) + * @see + * org.apache.jetspeed.om.page.BaseElement#setShortTitle(java.lang.String) */ public void setShortTitle(String title) { @@ -581,7 +590,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#checkAccess(java.lang.String) + * @see + * org.apache.jetspeed.om.common.SecuredResource#checkAccess(java.lang.String + * ) */ public void checkAccess(String actions) throws SecurityException { @@ -592,7 +603,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#checkConstraints(java.lang.String) + * @see + * org.apache.jetspeed.om.common.SecuredResource#checkConstraints(java.lang + * .String) */ public void checkConstraints(String actions) throws SecurityException { @@ -614,7 +627,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled() */ public boolean getConstraintsEnabled() { @@ -625,7 +639,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled() */ public boolean getPermissionsEnabled() { @@ -636,7 +651,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getSecurityConstraints() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getSecurityConstraints() */ public SecurityConstraints getSecurityConstraints() { @@ -647,7 +663,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#newSecurityConstraints() + * @see + * org.apache.jetspeed.om.common.SecuredResource#newSecurityConstraints() */ public SecurityConstraints newSecurityConstraints() { @@ -658,7 +675,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#newSecurityConstraint() + * @see + * org.apache.jetspeed.om.common.SecuredResource#newSecurityConstraint() */ public SecurityConstraint newSecurityConstraint() { @@ -669,7 +687,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#setSecurityConstraints(org.apache.jetspeed.om.common.SecurityConstraints) + * @see + * org.apache.jetspeed.om.common.SecuredResource#setSecurityConstraints( + * org.apache.jetspeed.om.common.SecurityConstraints) */ public void setSecurityConstraints(SecurityConstraints constraints) { @@ -701,6 +721,7 @@ return cf; } + // TODO Findbugs protected final class ContentFragmentList implements List, Serializable { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -75,10 +75,13 @@ private List preferences; + // TODO Findbugs private FragmentList fragmentsList; + // TODO Findbugs private FragmentPropertyMap propertiesMap; + // TODO Findbugs private FragmentPreferenceList fragmentPreferences; private PageImpl page; @@ -502,7 +505,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.impl.BaseElementImpl#getEffectivePageSecurity() + * @see + * org.apache.jetspeed.om.page.impl.BaseElementImpl#getEffectivePageSecurity + * () */ public PageSecurity getEffectivePageSecurity() { @@ -514,7 +519,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.impl.BaseElementImpl#getLogicalPermissionPath() + * @see + * org.apache.jetspeed.om.page.impl.BaseElementImpl#getLogicalPermissionPath + * () */ public String getLogicalPermissionPath() { @@ -528,7 +535,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.impl.BaseElementImpl#getPhysicalPermissionPath() + * @see + * org.apache.jetspeed.om.page.impl.BaseElementImpl#getPhysicalPermissionPath + * () */ public String getPhysicalPermissionPath() { @@ -542,7 +551,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.impl.BaseElementImpl#resetCachedSecurityConstraints() + * @seeorg.apache.jetspeed.om.page.impl.BaseElementImpl# + * resetCachedSecurityConstraints() */ public void resetCachedSecurityConstraints() { @@ -562,8 +572,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.impl.BaseElementImpl#checkPermissions(java.lang.String, - * int, boolean, boolean) + * @see + * org.apache.jetspeed.om.page.impl.BaseElementImpl#checkPermissions(java + * .lang.String, int, boolean, boolean) */ public void checkPermissions(String path, int mask, boolean checkNodeOnly, boolean checkParentsOnly) throws SecurityException @@ -576,7 +587,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled() */ public boolean getConstraintsEnabled() { @@ -587,7 +599,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled() */ public boolean getPermissionsEnabled() { @@ -724,7 +737,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String) */ public int getIntProperty(String propName) { @@ -736,7 +750,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String) */ public float getFloatProperty(String propName) { @@ -832,7 +847,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String) */ public void setLayoutSizes(String sizes) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -52,6 +52,7 @@ private List menus; + // TODO Findbugs private PageMenuDefinitionList menuDefinitions; private FragmentImpl removedFragment; @@ -82,7 +83,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.impl.BaseElementImpl#resetCachedSecurityConstraints() + * @seeorg.apache.jetspeed.om.page.impl.BaseElementImpl# + * resetCachedSecurityConstraints() */ public void resetCachedSecurityConstraints() { @@ -98,7 +100,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.document.impl.NodeImpl#newPageMetadata(java.util.Collection) + * @see + * org.apache.jetspeed.page.document.impl.NodeImpl#newPageMetadata(java. + * util.Collection) */ public PageMetadataImpl newPageMetadata(Collection fields) { @@ -131,7 +135,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Page#getEffectiveDefaultDecorator(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Page#getEffectiveDefaultDecorator(java.lang + * .String) */ public String getEffectiveDefaultDecorator(String fragmentType) { @@ -151,7 +157,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Page#getDefaultDecorator(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Page#getDefaultDecorator(java.lang.String) */ public String getDefaultDecorator(String fragmentType) { @@ -167,7 +174,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Page#getDefaultDecorator(java.lang.String,java.lang.String) + * @see + * org.apache.jetspeed.om.page.Page#getDefaultDecorator(java.lang.String + * ,java.lang.String) */ public void setDefaultDecorator(String decoratorName, String fragmentType) { @@ -211,7 +220,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Page#setRootFragment(org.apache.jetspeed.om.page.Fragment) + * @see + * org.apache.jetspeed.om.page.Page#setRootFragment(org.apache.jetspeed. + * om.page.Fragment) */ public void setRootFragment(Fragment fragment) { @@ -304,7 +315,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Page#removeFragmentById(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Page#removeFragmentById(java.lang.String) */ public Fragment removeFragmentById(String id) { @@ -328,7 +340,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Page#getFragmentsByName(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Page#getFragmentsByName(java.lang.String) */ public List getFragmentsByName(String name) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -59,6 +59,7 @@ private String name; + // TODO Findbugs private FragmentList fragmentsList; private PageImpl page; @@ -394,6 +395,7 @@ */ public boolean equals(Object obj) { + // TODO Findbugs boolean isEqual = false; if (obj != null && obj instanceof Fragment) { @@ -499,7 +501,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.psml.AbstractElementImpl#getEffectivePageSecurity() + * @see + * org.apache.jetspeed.om.page.psml.AbstractElementImpl#getEffectivePageSecurity + * () */ public PageSecurity getEffectivePageSecurity() { @@ -511,7 +515,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.psml.AbstractElementImpl#getLogicalPermissionPath() + * @see + * org.apache.jetspeed.om.page.psml.AbstractElementImpl#getLogicalPermissionPath + * () */ public String getLogicalPermissionPath() { @@ -525,7 +531,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.psml.AbstractBaseElementImpl#getPhysicalPermissionPath() + * @seeorg.apache.jetspeed.om.page.psml.AbstractBaseElementImpl# + * getPhysicalPermissionPath() */ public String getPhysicalPermissionPath() { @@ -539,8 +546,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.psml.AbstractElementImpl#checkPermissions(java.lang.String, - * int, boolean, boolean) + * @see + * org.apache.jetspeed.om.page.psml.AbstractElementImpl#checkPermissions + * (java.lang.String, int, boolean, boolean) */ public void checkPermissions(String path, int mask, boolean checkNodeOnly, boolean checkParentsOnly) throws SecurityException @@ -553,7 +561,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled() */ public boolean getConstraintsEnabled() { @@ -564,7 +573,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled() */ public boolean getPermissionsEnabled() { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -44,6 +44,7 @@ public class PageImpl extends DocumentImpl implements Page { + // TODO Findbugs private DefaultsImpl defaults = new DefaultsImpl(); private Fragment root = null; @@ -126,7 +127,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Page#getEffectiveDefaultDecorator(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Page#getEffectiveDefaultDecorator(java.lang + * .String) */ public String getEffectiveDefaultDecorator(String fragmentType) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -1142,6 +1142,7 @@ { menu = newFolderMenuDefinition(); } + // TODO Findbugs menu.setDepth(source.getDepth()); menu.setName(source.getName()); menu.setOptions(source.getOptions()); @@ -1189,6 +1190,7 @@ { menuExclude = newFolderMenuExcludeDefinition(); } + // TODO Findbugs menuExclude.setName(source.getName()); return menuExclude; } @@ -1205,6 +1207,7 @@ { menuInclude = newFolderMenuIncludeDefinition(); } + // TODO Findbugs menuInclude.setName(source.getName()); menuInclude.setNest(source.isNest()); return menuInclude; @@ -1222,6 +1225,7 @@ { menuOptions = newFolderMenuOptionsDefinition(); } + // TODO Findbugs menuOptions.setDepth(source.getDepth()); menuOptions.setOptions(source.getOptions()); menuOptions.setOrder(source.getOrder()); @@ -1244,6 +1248,7 @@ { menuSeparator = newFolderMenuSeparatorDefinition(); } + // TODO Findbugs menuSeparator.setSkin(source.getSkin()); menuSeparator.setTitle(source.getTitle()); menuSeparator.setText(source.getText()); @@ -1299,6 +1304,7 @@ { dstConstraint = newFragmentSecurityConstraint(); } + // TODO Findbugs copyConstraint(srcConstraint, dstConstraint); copiedConstraints.add(dstConstraint); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/PageManagerUtils.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -43,6 +43,7 @@ public class PageManagerUtils { + // TODO Findbugs protected static Log log = LogFactory.getLog(PageManagerUtils.class); /** Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -169,8 +169,8 @@ * @param name * @return * @throws DocumentNotFoundException - * @throws DocumentException, - * DocumentNotFoundException + * @throws DocumentException + * , DocumentNotFoundException */ public Document getDocument(String name) throws NodeException, DocumentNotFoundException @@ -388,6 +388,7 @@ Mapping mapping = null; try { + // TODO Findbugs InputStream stream = getClass().getResourceAsStream(mappingFile); if (log.isDebugEnabled()) @@ -626,7 +627,7 @@ } }); } - + // TODO Findbugs document.setPath(path); AbstractBaseElement documentImpl = (AbstractBaseElement) document; documentImpl.setHandlerFactory(handlerFactory); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -57,7 +57,8 @@ *

* * @author Scott T. Weaver - * @version $Id: FileSystemFolderHandler.java 553584 2007-07-05 18:09:45Z taylor $ + * @version $Id: FileSystemFolderHandler.java 553584 2007-07-05 18:09:45Z taylor + * $ * */ public class FileSystemFolderHandler implements FolderHandler, @@ -155,8 +156,8 @@ * @param path * @param fromCache * @return - * @throws DocumentException, - * FolderNotFoundException + * @throws DocumentException + * , FolderNotFoundException * @throws InvalidFolderException * @throws DocumentNotFoundException */ @@ -492,6 +493,7 @@ private String documentType; + // TODO Findbugs public DocumentTypeFilter(String documentType) { this.documentType = documentType; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -327,7 +327,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#newFolderMenuExcludeDefinition() + * @see + * org.apache.jetspeed.page.PageManager#newFolderMenuExcludeDefinition() */ public MenuExcludeDefinition newFolderMenuExcludeDefinition() { @@ -337,7 +338,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#newFolderMenuIncludeDefinition() + * @see + * org.apache.jetspeed.page.PageManager#newFolderMenuIncludeDefinition() */ public MenuIncludeDefinition newFolderMenuIncludeDefinition() { @@ -347,7 +349,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#newFolderMenuOptionsDefinition() + * @see + * org.apache.jetspeed.page.PageManager#newFolderMenuOptionsDefinition() */ public MenuOptionsDefinition newFolderMenuOptionsDefinition() { @@ -357,7 +360,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#newFolderMenuSeparatorDefinition() + * @see + * org.apache.jetspeed.page.PageManager#newFolderMenuSeparatorDefinition() */ public MenuSeparatorDefinition newFolderMenuSeparatorDefinition() { @@ -407,7 +411,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#newPageMenuSeparatorDefinition() + * @see + * org.apache.jetspeed.page.PageManager#newPageMenuSeparatorDefinition() */ public MenuSeparatorDefinition newPageMenuSeparatorDefinition() { @@ -467,7 +472,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#newPageSecuritySecurityConstraint() + * @see + * org.apache.jetspeed.page.PageManager#newPageSecuritySecurityConstraint() */ public SecurityConstraint newPageSecuritySecurityConstraint() { @@ -497,7 +503,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#addListener(org.apache.jetspeed.page.PageManagerEventListener) + * @see + * org.apache.jetspeed.page.PageManager#addListener(org.apache.jetspeed. + * page.PageManagerEventListener) */ public void addListener(PageManagerEventListener listener) { @@ -507,7 +515,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#removeListener(org.apache.jetspeed.page.PageManagerEventListener) + * @see + * org.apache.jetspeed.page.PageManager#removeListener(org.apache.jetspeed + * .page.PageManagerEventListener) */ public void removeListener(PageManagerEventListener listener) { @@ -585,7 +595,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getContentPage(java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#getContentPage(java.lang.String) */ public ContentPage getContentPage(String path) throws PageNotFoundException, NodeException @@ -783,7 +794,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getFolders(org.apache.jetspeed.om.folder.Folder) + * @see + * org.apache.jetspeed.page.PageManager#getFolders(org.apache.jetspeed.om + * .folder.Folder) */ public NodeSet getFolders(Folder folder) throws DocumentException { @@ -808,6 +821,7 @@ } folderImpl.resetFolders(true); } + // TODO Findbugs catch (Exception e) { // reset cache in folder @@ -824,7 +838,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getFolder(org.apache.jetspeed.om.folder.Folder,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#getFolder(org.apache.jetspeed.om + * .folder.Folder,java.lang.String) */ public Folder getFolder(Folder folder, String name) throws FolderNotFoundException, DocumentException @@ -849,7 +865,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getPages(org.apache.jetspeed.om.folder.Folder) + * @see + * org.apache.jetspeed.page.PageManager#getPages(org.apache.jetspeed.om. + * folder.Folder) */ public NodeSet getPages(Folder folder) throws NodeException { @@ -874,6 +892,7 @@ } folderImpl.resetPages(true); } + // TODO Findbugs catch (Exception e) { // reset cache in folder @@ -890,7 +909,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getPage(org.apache.jetspeed.om.folder.Folder,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#getPage(org.apache.jetspeed.om.folder + * .Folder,java.lang.String) */ public Page getPage(Folder folder, String name) throws PageNotFoundException, NodeException @@ -915,7 +936,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getLinks(org.apache.jetspeed.om.folder.Folder) + * @see + * org.apache.jetspeed.page.PageManager#getLinks(org.apache.jetspeed.om. + * folder.Folder) */ public NodeSet getLinks(Folder folder) throws NodeException { @@ -940,6 +963,7 @@ } folderImpl.resetLinks(true); } + // TODO Findbugs catch (Exception e) { // reset cache in folder @@ -956,7 +980,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getLink(org.apache.jetspeed.om.folder.Folder,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#getLink(org.apache.jetspeed.om.folder + * .Folder,java.lang.String) */ public Link getLink(Folder folder, String name) throws DocumentNotFoundException, NodeException @@ -981,7 +1007,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getPageSecurity(org.apache.jetspeed.om.folder.Folder) + * @see + * org.apache.jetspeed.page.PageManager#getPageSecurity(org.apache.jetspeed + * .om.folder.Folder) */ public PageSecurity getPageSecurity(Folder folder) throws DocumentNotFoundException, NodeException @@ -1009,6 +1037,7 @@ // cache page security in folder folderImpl.resetPageSecurity((PageSecurityImpl) document, true); } + // TODO Findbugs catch (Exception e) { // reset page security in folder @@ -1032,7 +1061,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getAll(org.apache.jetspeed.om.folder.Folder) + * @see + * org.apache.jetspeed.page.PageManager#getAll(org.apache.jetspeed.om.folder + * .Folder) */ public NodeSet getAll(Folder folder) throws DocumentException { @@ -1080,6 +1111,7 @@ folderImpl.accessAll().addAll(all); folderImpl.resetAll(true); } + // TODO Findbugs catch (Exception e) { // reset cache in folder @@ -1097,7 +1129,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#updatePage(org.apache.jetspeed.om.page.Page) + * @see + * org.apache.jetspeed.page.PageManager#updatePage(org.apache.jetspeed.om + * .page.Page) */ public void updatePage(Page page) throws NodeException, PageNotUpdatedException @@ -1197,7 +1231,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#removePage(org.apache.jetspeed.om.page.Page) + * @see + * org.apache.jetspeed.page.PageManager#removePage(org.apache.jetspeed.om + * .page.Page) */ public void removePage(Page page) throws NodeException, PageNotRemovedException @@ -1252,7 +1288,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#updateFolder(org.apache.jetspeed.om.folder.Folder) + * @see + * org.apache.jetspeed.page.PageManager#updateFolder(org.apache.jetspeed + * .om.folder.Folder) */ public void updateFolder(Folder folder) throws NodeException, FolderNotUpdatedException @@ -1264,7 +1302,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#updateFolder(org.apache.jetspeed.om.folder.Folder,boolean) + * @see + * org.apache.jetspeed.page.PageManager#updateFolder(org.apache.jetspeed + * .om.folder.Folder,boolean) */ public void updateFolder(Folder folder, boolean deep) throws NodeException, FolderNotUpdatedException @@ -1397,8 +1437,7 @@ * * @param folderImpl * folder whose nodes are to be updated - * @param throws - * FolderNotUpdatedException + * @param throws FolderNotUpdatedException */ private void updateFolderNodes(FolderImpl folderImpl) throws FolderNotUpdatedException @@ -1476,7 +1515,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#removeFolder(org.apache.jetspeed.om.folder.Folder) + * @see + * org.apache.jetspeed.page.PageManager#removeFolder(org.apache.jetspeed + * .om.folder.Folder) */ public void removeFolder(Folder folder) throws NodeException, FolderNotRemovedException @@ -1535,8 +1576,7 @@ * * @param folderImpl * folder whose nodes are to be removed - * @param throws - * FolderNotRemovedException + * @param throws FolderNotRemovedException */ private void removeFolderNodes(FolderImpl folderImpl) throws FolderNotRemovedException @@ -1614,7 +1654,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#updateLink(org.apache.jetspeed.om.page.Link) + * @see + * org.apache.jetspeed.page.PageManager#updateLink(org.apache.jetspeed.om + * .page.Link) */ public void updateLink(Link link) throws NodeException, LinkNotUpdatedException @@ -1710,7 +1752,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#removeLink(org.apache.jetspeed.om.page.Link) + * @see + * org.apache.jetspeed.page.PageManager#removeLink(org.apache.jetspeed.om + * .page.Link) */ public void removeLink(Link link) throws NodeException, LinkNotRemovedException @@ -1761,7 +1805,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#updatePageSecurity(org.apache.jetspeed.om.page.PageSecurity) + * @see + * org.apache.jetspeed.page.PageManager#updatePageSecurity(org.apache.jetspeed + * .om.page.PageSecurity) */ public void updatePageSecurity(PageSecurity pageSecurity) throws NodeException, FailedToUpdateDocumentException @@ -1878,7 +1924,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#removePageSecurity(org.apache.jetspeed.om.page.PageSecurity) + * @see + * org.apache.jetspeed.page.PageManager#removePageSecurity(org.apache.jetspeed + * .om.page.PageSecurity) */ public void removePageSecurity(PageSecurity pageSecurity) throws NodeException, FailedToDeleteDocumentException @@ -1933,7 +1981,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#copyPage(org.apache.jetspeed.om.page.Page,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#copyPage(org.apache.jetspeed.om. + * page.Page,java.lang.String) */ public Page copyPage(Page source, String path) throws NodeException, PageNotUpdatedException @@ -1944,7 +1994,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#copyLink(org.apache.jetspeed.om.page.Link,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#copyLink(org.apache.jetspeed.om. + * page.Link,java.lang.String) */ public Link copyLink(Link source, String path) throws NodeException, LinkNotUpdatedException @@ -1955,7 +2007,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#copyFolder(org.apache.jetspeed.om.folder.Folder,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#copyFolder(org.apache.jetspeed.om + * .folder.Folder,java.lang.String) */ public Folder copyFolder(Folder source, String path) throws NodeException, PageNotUpdatedException @@ -1966,7 +2020,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#copyFragment(org.apache.jetspeed.om.page.Fragment,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#copyFragment(org.apache.jetspeed + * .om.page.Fragment,java.lang.String) */ public Fragment copyFragment(Fragment source, String name) throws NodeException, PageNotUpdatedException @@ -1977,7 +2033,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#copyPageSecurity(org.apache.jetspeed.om.page.PageSecurity) + * @see + * org.apache.jetspeed.page.PageManager#copyPageSecurity(org.apache.jetspeed + * .om.page.PageSecurity) */ public PageSecurity copyPageSecurity(PageSecurity source) throws NodeException @@ -1988,7 +2046,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#getUserPage(java.lang.String,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#getUserPage(java.lang.String,java + * .lang.String) */ public Page getUserPage(String userName, String pageName) throws PageNotFoundException, NodeException @@ -2066,7 +2126,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#userFolderExists(java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#userFolderExists(java.lang.String) */ public boolean userFolderExists(String userName) { @@ -2084,7 +2145,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#userPageExists(java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#userPageExists(java.lang.String) */ public boolean userPageExists(String userName, String pageName) { @@ -2093,6 +2155,7 @@ getPage(Folder.USER_FOLDER + userName + Folder.PATH_SEPARATOR + pageName); } + // TODO Findbugs catch (Exception e) { return false; @@ -2103,7 +2166,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#createUserHomePagesFromRoles(java.security.auth.Subject) + * @see + * org.apache.jetspeed.page.PageManager#createUserHomePagesFromRoles(java + * .security.auth.Subject) */ public void createUserHomePagesFromRoles(Subject subject) throws NodeException @@ -2114,7 +2179,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#deepCopyFolder(org.apache.jetspeed.om.folder.Folder,java.lang.String,java.lang.String) + * @see + * org.apache.jetspeed.page.PageManager#deepCopyFolder(org.apache.jetspeed + * .om.folder.Folder,java.lang.String,java.lang.String) */ public void deepCopyFolder(Folder srcFolder, String destinationPath, String owner) throws NodeException, PageNotUpdatedException @@ -2126,7 +2193,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManager#addPages(org.apache.jetspeed.om.page.Page[]) + * @see + * org.apache.jetspeed.page.PageManager#addPages(org.apache.jetspeed.om. + * page.Page[]) */ public int addPages(Page[] pages) throws NodeException { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -400,8 +400,9 @@ /* * (non-Javadoc) * - * @see org.apache.ojb.broker.cache.ObjectCache#cache(org.apache.ojb.broker.Identity, - * java.lang.Object) + * @see + * org.apache.ojb.broker.cache.ObjectCache#cache(org.apache.ojb.broker.Identity + * , java.lang.Object) */ public void cache(Identity oid, Object obj) { @@ -421,7 +422,9 @@ /* * (non-Javadoc) * - * @see org.apache.ojb.broker.cache.ObjectCache#lookup(org.apache.ojb.broker.Identity) + * @see + * org.apache.ojb.broker.cache.ObjectCache#lookup(org.apache.ojb.broker. + * Identity) */ public Object lookup(Identity oid) { @@ -431,7 +434,9 @@ /* * (non-Javadoc) * - * @see org.apache.ojb.broker.cache.ObjectCache#remove(org.apache.ojb.broker.Identity) + * @see + * org.apache.ojb.broker.cache.ObjectCache#remove(org.apache.ojb.broker. + * Identity) */ public void remove(Identity oid) { @@ -460,6 +465,7 @@ System.out.println("--------------------------2"); } + // TODO Findbugs protected static ThreadLocal transactionedOperations = new ThreadLocal(); public static List getTransactions() Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareCollection.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareCollection.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareCollection.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -1,5 +1,6 @@ package org.apache.jetspeed.util.collections; +//TODO Findbugs public class RemovalAwareCollection extends org.apache.ojb.broker.util.collections.RemovalAwareCollection { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareList.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareList.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/util/collections/RemovalAwareList.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -1,5 +1,6 @@ package org.apache.jetspeed.util.collections; +//TODO Findbugs public class RemovalAwareList extends org.apache.ojb.broker.util.collections.RemovalAwareList { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -73,6 +73,7 @@ { if (!directory.exists()) { + // TODO Findbugs directory.mkdirs(); } @@ -162,7 +163,7 @@ if (child.isFile()) { File toFile = new File(dstDir, child.getName()); - + // TODO Findbugs toFile.createNewFile(); srcChannel = new FileInputStream(child).getChannel(); @@ -198,6 +199,7 @@ else { File newSubDir = new File(dstDir, child.getName()); + // TODO Findbugs newSubDir.mkdir(); copyFilesAndTransform(child, newSubDir, fileFilter); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestCastorXmlPageManager.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -126,8 +126,8 @@ /** * Creates the test suite. * - * @return a test suite (TestSuite) that includes all - * methods starting with "test" + * @return a test suite (TestSuite) that includes all methods + * starting with "test" */ public static Test suite() { @@ -904,6 +904,7 @@ boolean exceptionFound = false; try { + // TODO Findbugs page = pageManager.getPage(this.testPage002); } catch (DocumentNotFoundException dnfe) @@ -932,6 +933,7 @@ boolean exceptionFound = false; try { + // TODO Findbugs folder = pageManager.getFolder(this.testFolder2); } catch (FolderNotFoundException fnfe) @@ -960,6 +962,7 @@ boolean exceptionFound = false; try { + // TODO Findbugs link = pageManager.getLink(this.testLink002); } catch (DocumentNotFoundException dnfe) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/TestDatabasePageManager.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -139,7 +139,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManagerEventListener#newNode(org.apache.jetspeed.page.document.Node) + * @see + * org.apache.jetspeed.page.PageManagerEventListener#newNode(org.apache. + * jetspeed.page.document.Node) */ public void newNode(Node node) { @@ -149,7 +151,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManagerEventListener#newNode(org.apache.jetspeed.page.document.Node) + * @see + * org.apache.jetspeed.page.PageManagerEventListener#newNode(org.apache. + * jetspeed.page.document.Node) */ public void updatedNode(Node node) { @@ -159,7 +163,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.page.PageManagerEventListener#newNode(org.apache.jetspeed.page.document.Node) + * @see + * org.apache.jetspeed.page.PageManagerEventListener#newNode(org.apache. + * jetspeed.page.document.Node) */ public void removedNode(Node node) { @@ -1163,6 +1169,7 @@ assertEquals(22, removedNodeCount); // last test has been run + // TODO Findbugs lastTestRun = true; } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/page-manager/src/test/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -106,8 +106,8 @@ /** * Creates the test suite. * - * @return a test suite (TestSuite) that includes all - * methods starting with "test" + * @return a test suite (TestSuite) that includes all methods + * starting with "test" */ public static Test suite() { @@ -139,6 +139,7 @@ { try { + // TODO Findbugs Document doc = folderMetaDataDocumentHandler .getDocument("/folder1/folder.metadata", false); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/redirect/impl/SSLRedirectValveImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/redirect/impl/SSLRedirectValveImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/redirect/impl/SSLRedirectValveImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -151,6 +151,7 @@ PrintWriter out = request.getResponse().getWriter(); out.print(REDIRECT_CONTENT_PREFIX); + // TODO Findbugs out.print(url.toString()); out.print(REDIRECT_CONTENT_SUFFIX); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/servlet/UserManagerServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/servlet/UserManagerServlet.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/jp/sf/pal/portal/servlet/UserManagerServlet.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -65,12 +65,16 @@ public static final String EXCLUDED_USER_STATUS = "excluded-user"; + // TODO Findbugs private UserManager userManager; + // TODO Findbugs private GroupManager groupManager; + // TODO Findbugs private RoleManager roleManager; + // TODO Findbugs private Profiler profiler; private String[] excludedUsernames; @@ -88,6 +92,7 @@ */ public void destroy() { + // TODO Findbugs userManager = null; } @@ -442,6 +447,7 @@ if (username == null) { setResponseHeader(resp); + // TODO Findbugs printResult(printWriter, INVALID_PARAMETER_STATUS, "Invalid parameter(s): username=" + username, null); return; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/CommonjWorkerMonitorImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/CommonjWorkerMonitorImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/CommonjWorkerMonitorImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -66,7 +66,9 @@ /** CommonJ Work Manamger provided by JavaEE container */ protected WorkManager workManager; - /** If true, invoke interrupt() on the worker thread when the job is timeout. */ + /** + * If true, invoke interrupt() on the worker thread when the job is timeout. + */ protected boolean interruptOnTimeout = true; /** Enable rendering job works monitor thread for timeout checking */ @@ -211,6 +213,7 @@ { WorkItem monitorWorkItem = this.workManager.schedule( monitoringWork, this); + // TODO Findbugs lock.wait(); } } @@ -570,6 +573,7 @@ if (!content.isComplete()) { worker.interrupt(); + // TODO Findbugs content.wait(); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletAggregatorFragmentImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -54,7 +54,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled() */ public boolean getConstraintsEnabled() { @@ -64,7 +65,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getSecurityConstraints() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getSecurityConstraints() */ public SecurityConstraints getSecurityConstraints() { @@ -74,7 +76,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#setSecurityConstraints(org.apache.jetspeed.om.common.SecurityConstraints) + * @see + * org.apache.jetspeed.om.common.SecuredResource#setSecurityConstraints( + * org.apache.jetspeed.om.common.SecurityConstraints) */ public void setSecurityConstraints(SecurityConstraints constraints) { @@ -83,7 +87,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#newSecurityConstraints() + * @see + * org.apache.jetspeed.om.common.SecuredResource#newSecurityConstraints() */ public SecurityConstraints newSecurityConstraints() { @@ -93,7 +98,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#newSecurityConstraint() + * @see + * org.apache.jetspeed.om.common.SecuredResource#newSecurityConstraint() */ public SecurityConstraint newSecurityConstraint() { @@ -103,7 +109,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#checkConstraints(java.lang.String) + * @see + * org.apache.jetspeed.om.common.SecuredResource#checkConstraints(java.lang + * .String) */ public void checkConstraints(String actions) throws SecurityException { @@ -112,7 +120,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled() + * @see + * org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled() */ public boolean getPermissionsEnabled() { @@ -131,7 +140,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.SecuredResource#checkAccess(java.lang.String) + * @see + * org.apache.jetspeed.om.common.SecuredResource#checkAccess(java.lang.String + * ) */ public void checkAccess(String actions) throws SecurityException { @@ -179,7 +190,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.BaseElement#setShortTitle(java.lang.String) + * @see + * org.apache.jetspeed.om.page.BaseElement#setShortTitle(java.lang.String) */ public void setShortTitle(String title) { @@ -337,7 +349,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#getIntProperty(java.lang.String) */ public int getIntProperty(String propName) { @@ -347,7 +360,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#getFloatProperty(java.lang.String) */ public float getFloatProperty(String propName) { @@ -455,7 +469,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String) + * @see + * org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String) */ public void setLayoutSizes(String sizes) { @@ -523,6 +538,7 @@ */ public Object clone() throws CloneNotSupportedException { + // TODO Findbugs return null; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -60,8 +60,7 @@ import org.apache.pluto.om.window.PortletWindow; /** - *

PortletRendererService
- * Jetspeed-2 Rendering service.

+ *

PortletRendererService
Jetspeed-2 Rendering service.

*

* This service process all portlet rendering requests and interfaces with the * portlet container to generate the resulting markup @@ -390,6 +389,7 @@ catch (Exception e1) { log.error("render() failed: " + e1.toString(), e1); + // TODO Findbugs fragment.overrideRenderedContent(e1.getLocalizedMessage()); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/aggregator/impl/WorkerMonitorImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -427,6 +427,7 @@ if (!content.isComplete()) { worker.interrupt(); + // TODO Findbugs content.wait(); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/ajax/AJAXRequestImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/ajax/AJAXRequestImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/ajax/AJAXRequestImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -122,6 +122,7 @@ } } + // TODO Findbugs public class AJAXParameter { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/cluster/NodeManagerImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -60,6 +60,7 @@ rootIndexDir = new File(indexRoot); this.nodeInformationBean = nodeInformationBean; + // TODO Findbugs if (!(rootIndexDir.exists())) rootIndexDir.mkdirs(); load(); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/DesktopPortletContainerImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/DesktopPortletContainerImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/DesktopPortletContainerImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -191,6 +191,7 @@ } else { // do real redirect + // TODO Findbugs location = location.replaceAll(this.desktopActionPipelinePath, this.desktopPipelinePath); location = location.replaceAll(this.desktopRenderPipelinePath, Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/PageHistoryValve.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/PageHistoryValve.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/container/PageHistoryValve.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -41,6 +41,7 @@ // SessionFullExtendedNavigationalState object needs this. public static final String REQUEST_CLEAR_PORTLETS_MODE_AND_WINDOWSTATE_KEY = "clearPortletsModeAndWindowState"; + // TODO Findbugs private final String SESSION_PREVIOUS_PAGEID_KEY = "PreviousPageId"; private boolean valveDisabled = false; @@ -48,8 +49,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.pipeline.valve.AbstractValve#invoke(org.apache.jetspeed.request.RequestContext, - * org.apache.jetspeed.pipeline.valve.ValveContext) + * @see + * org.apache.jetspeed.pipeline.valve.AbstractValve#invoke(org.apache.jetspeed + * .request.RequestContext, org.apache.jetspeed.pipeline.valve.ValveContext) */ public void invoke(RequestContext request, ValveContext context) throws PipelineException Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/BaseDecoration.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/BaseDecoration.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/decoration/BaseDecoration.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -303,6 +303,7 @@ "The resource directory cannot be parsed as a URL: " + resourceDirName, resourceName + "_" + locale, ""); } + // TODO Findbugs return ResourceBundle.getBundle(resourceName, locale, new URLClassLoader(urls)); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployDecoratorEventListener.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -144,6 +144,7 @@ deployPath.length()) + File.separator + id); log.info("Deploying locale specific decorator component to " + deployToPathFile.getPath()); + // TODO Findbugs deployToPathFile.mkdirs(); // deploy decorator components by moving from deployed decorator @@ -159,6 +160,7 @@ }); for (int i = 0; (i < filesToDeploy.length); i++) { + // TODO Findbugs filesToDeploy[i].renameTo(new File(deployToPathFile, filesToDeploy[i].getName())); } @@ -239,6 +241,7 @@ localeDeployPathFile); cleanup.remove(); cleanup.close(); + // TODO Findbugs localeDeployPathFile.getParentFile().delete(); } } @@ -262,7 +265,8 @@ * getDecorationConfiguration *

* - * @param event @ + * @param event + * @ * @return configuration * @throws DeploymentException */ Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -120,6 +120,7 @@ if (!localAppDirFile.exists()) { + // TODO Findbugs localAppDirFile.mkdirs(); } else if (!localAppDirFile.isDirectory()) { throw new FileNotFoundException( @@ -308,6 +309,7 @@ urls.add(jar.toURL()); } } + // TODO Findbugs return new URLClassLoader((URL[]) urls.toArray(new URL[urls.size()]), getClass().getClassLoader()); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JarExpander.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JarExpander.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JarExpander.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -44,7 +44,7 @@ cleanup.remove(); cleanup.close(); } - + // TODO Findbugs targetDir.mkdirs(); JarFile jarFile = new JarFile(srcFile); @@ -66,6 +66,7 @@ if (jarEntry.isDirectory()) { + // TODO Findbugs entryFile.mkdir(); } else @@ -75,6 +76,7 @@ entryFile.getParentFile().mkdirs(); } + // TODO Findbugs entryFile.createNewFile(); try Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/deployment/impl/JettyDeployPortletAppEventListener.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -111,6 +111,7 @@ { context = getCurrentJettyContext(contextFile); } + // TODO Findbugs contextFile.delete(); } if (context == null) @@ -134,6 +135,7 @@ File warFile = new File(getWebAppDir(), contextName + ".war"); if (warFile.exists()) { + // TODO Findbugs warFile.delete(); } File warDir = new File(getWebAppDir(), contextName); @@ -204,6 +206,7 @@ InputStream source = null; try { + // TODO Findbugs source = getClass().getResourceAsStream( "jetty/context-template.xml"); return parseJettyContext(source); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -158,7 +158,8 @@ // registry // but not when dispatching, still trying to figure that out // PortletApplicationManagement pam = - // (PortletApplicationManagement)componentManager.getComponent("PAM"); + //(PortletApplicationManagement)componentManager.getComponent("PAM") + // ; // pam.startInternalApplication(config.getServletName()); } @@ -218,6 +219,7 @@ { throw new JetspeedException(e); } + // TODO Findbugs System.gc(); } @@ -261,6 +263,7 @@ pipeline = getPipeline(); context.setPipeline(pipeline); + // TODO Findbugs pipeline.invoke(context); long end = System.currentTimeMillis(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedServlet.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -106,11 +106,13 @@ */ public final void init(ServletConfig config) throws ServletException { + // TODO Findbugs synchronized (this.getClass()) { if (log == null) { log = LogFactory.getLog(JetspeedServlet.class); + // TODO Findbugs console = LogFactory.getLog(CONSOLE_LOGGER); } @@ -159,6 +161,7 @@ { console.log("0900013"); } + // TODO Findbugs webappRoot = config.getServletContext().getRealPath("/"); // console // .info("JetspeedServlet identifed web application root as " @@ -188,6 +191,7 @@ { console.log("0900015"); // REPLACED } + // TODO Findbugs engine = new JetspeedEngine(properties, applicationRoot, config, initializeComponentManager(config, applicationRoot, properties)); @@ -208,6 +212,7 @@ { console.log("0900017"); // REPLACED } + // TODO Findbugs contextComponent = (RequestContextComponent) Jetspeed .getComponentManager().getComponent( RequestContextComponent.class); @@ -216,6 +221,7 @@ { // save the exception to complain loudly later :-) final String msg = "Jetspeed: init() failed: "; + // TODO Findbugs initFailure = e; // log.fatal(msg, e); log.log("0900006", e); // REPLACED @@ -298,7 +304,9 @@ { // ensure that no proxy or brower caching is performed // on dynamic responses resulting from pipeline execution - res.setHeader("Cache-Control", "no-cache,no-store,private"); // HTTP/1.1 + res.setHeader("Cache-Control", "no-cache,no-store,private"); // HTTP + // / + // 1.1 // modern // browser/proxy res.setHeader("Pragma", "no-cache"); // HTTP/1.0 non-standard @@ -366,6 +374,7 @@ } // Allow turbine to be started back up again. + // TODO Findbugs firstInit = true; // log.info("Done shutting down!"); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/HttpSessionWrapper.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/HttpSessionWrapper.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/HttpSessionWrapper.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -42,6 +42,7 @@ */ public boolean equals(Object obj) { + // TODO Findbugs return session.equals(obj); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -555,6 +555,7 @@ { entityID = entity.getId().toString(); } + // TODO Findbugs PortletApplicationDefinition portletAppDef = entity .getPortletDefinition() .getPortletApplicationDefinition(); @@ -595,7 +596,7 @@ public Locale getLocale() { // Locale preferedLocale = (Locale) - // getSession().getAttribute(RequestContext.PREFERED_LOCALE_SESSION_KEY); + //getSession().getAttribute(RequestContext.PREFERED_LOCALE_SESSION_KEY); RequestContext requestContext = (RequestContext) _getHttpServletRequest() .getAttribute( PortalReservedParameters.REQUEST_CONTEXT_ATTRIBUTE); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/DatasourceAvailableHealthCheckValidator.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -35,34 +35,47 @@ * @author Ruben Carvalho * @version $Id$ */ -public class DatasourceAvailableHealthCheckValidator implements HealthCheckValidator +public class DatasourceAvailableHealthCheckValidator implements + HealthCheckValidator { - private static final Log log = LogFactory.getLog(DatasourceAvailableHealthCheckValidator.class); + + private static final Log log = LogFactory + .getLog(DatasourceAvailableHealthCheckValidator.class); + public static boolean isInfoEnabled = log.isInfoEnabled(); + + // TODO Findbugs public static boolean isDebugEnabled = log.isDebugEnabled(); + /** - * Spring property resources. Maps the database name to a list of datasources. + * Spring property resources. Maps the database name to a list of + * datasources. */ private Map resources; + /** * Spring property numberOfRetries. */ private int numberOfRetries; + /** * Spring property retryDelay. */ private long retryDelay; + /** * Spring property stopValidationOnError. */ private boolean stopValidationOnError; + /** * Spring property requireAllValid. */ private boolean requireAllValid; - public DatasourceAvailableHealthCheckValidator(Map resources, int numberOfRetries, long retryDelay, - boolean stopValidationOnError, boolean requireAllValid) + public DatasourceAvailableHealthCheckValidator(Map resources, + int numberOfRetries, long retryDelay, + boolean stopValidationOnError, boolean requireAllValid) { this.resources = resources; this.numberOfRetries = numberOfRetries; @@ -75,7 +88,8 @@ { if (isDebugEnabled) { - log.debug("Starting method: DatasourceAvailableHealthCheckValidator.validate()"); + log + .debug("Starting method: DatasourceAvailableHealthCheckValidator.validate()"); } HealthCheckValidatorResult result = new HealthCheckValidatorResult(); boolean allDataSourcesStatus = true; @@ -86,7 +100,7 @@ for (Iterator it = dbNames.iterator(); it.hasNext();) { String dbName = (String) it.next(); - if (messages.length()>0) + if (messages.length() > 0) { messages.append(LINE_SEPARATOR); } @@ -95,10 +109,12 @@ { log.debug("Database: " + dbName); } - DataSourcesValidationBean dsBean = (DataSourcesValidationBean) resources.get(dbName); + DataSourcesValidationBean dsBean = (DataSourcesValidationBean) resources + .get(dbName); String validationQuery = dsBean.getValidationQuery(); boolean dbStatus = true; - for (Iterator it2 = dsBean.getDatasources().iterator(); it2.hasNext();) + for (Iterator it2 = dsBean.getDatasources().iterator(); it2 + .hasNext();) { DataSource ds = (DataSource) it2.next(); dbStatus = isDatasourceValid(validationQuery, ds); @@ -117,9 +133,9 @@ // the ds is not available if (requireAllValid) { - // all datasource(s) need to be available so - // we can interrupt this loop - break; + // all datasource(s) need to be available so + // we can interrupt this loop + break; } } } @@ -143,7 +159,8 @@ } if (!allDataSourcesStatus) { - result.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); + result + .setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); } } catch (Exception e) @@ -151,8 +168,11 @@ // if any exceptions occur, even runtime exceptions, return a failed // result log.error("Exception while running the datasource validator", e); - result.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); - messages.append("Exception while running the datasource validator: " + e.getMessage()); + result + .setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); + messages + .append("Exception while running the datasource validator: " + + e.getMessage()); } if (isDebugEnabled) { @@ -163,7 +183,8 @@ } /** - * Checks is a datasource is valid or not by executing a validationQuery + * Checks is a datasource is valid or not by executing a + * validationQuery * * @param validationQuery * The query to be executed @@ -171,7 +192,8 @@ * The datasource to be checked * @return Whether the datasource is available or not */ - private boolean isDatasourceValid(String validationQuery, DataSource dataSource) + private boolean isDatasourceValid(String validationQuery, + DataSource dataSource) { boolean dsStatus = true; Connection con = null; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/healthcheck/validators/PortletApplicationAvailableHeathCheckValidator.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -26,44 +26,58 @@ import org.apache.jetspeed.om.common.portlet.PortletApplication; /** - * Validator to check if the defined required applications have been initialised in the Jetspeed engine + * Validator to check if the defined required applications have been initialised + * in the Jetspeed engine * * @author Ruben Carvalho * @version $Id$ */ -public class PortletApplicationAvailableHeathCheckValidator implements HealthCheckValidator +public class PortletApplicationAvailableHeathCheckValidator implements + HealthCheckValidator { - private static final Log log = LogFactory.getLog(PortletApplicationAvailableHeathCheckValidator.class); + + private static final Log log = LogFactory + .getLog(PortletApplicationAvailableHeathCheckValidator.class); + public static boolean isInfoEnabled = log.isInfoEnabled(); + + // TODO Findbugs public static boolean isDebugEnabled = log.isDebugEnabled(); + /** * Spring property numberOfRetries. */ private int numberOfRetries; + /** * Spring property retryDelay. */ private long retryDelay; + /** * Spring property retryDelay. */ private List requiredPortletApplications; + /** * Spring property portletRegistry. */ private PortletRegistry portletRegistry; + /** * Spring property portletFactory. */ private PortletFactory portletFactory; + /** * Spring property stopValidationOnError. */ private boolean stopValidationOnError; - public PortletApplicationAvailableHeathCheckValidator(List requiredPortletApplications, int numberOfRetries, - long retryDelay, PortletRegistry portletRegistry, - PortletFactory portletFactory, boolean stopValidationOnError) + public PortletApplicationAvailableHeathCheckValidator( + List requiredPortletApplications, int numberOfRetries, + long retryDelay, PortletRegistry portletRegistry, + PortletFactory portletFactory, boolean stopValidationOnError) { this.requiredPortletApplications = requiredPortletApplications; this.numberOfRetries = numberOfRetries; @@ -82,7 +96,8 @@ { // check if all required apps have been registered and are // available. - for (Iterator it = requiredPortletApplications.iterator(); it.hasNext();) + for (Iterator it = requiredPortletApplications.iterator(); it + .hasNext();) { // the portlet application name String paName = (String) it.next(); @@ -90,13 +105,15 @@ { log.debug("Checking portlet application: " + paName); } - if (messages.length()>0) + if (messages.length() > 0) { messages.append(LINE_SEPARATOR); } messages.append(paName + ": "); - PortletApplication pa = portletRegistry.getPortletApplication(paName); - boolean thisPAStatus = portletFactory.isPortletApplicationRegistered(pa); + PortletApplication pa = portletRegistry + .getPortletApplication(paName); + boolean thisPAStatus = portletFactory + .isPortletApplicationRegistered(pa); if (thisPAStatus) { messages.append("is up"); @@ -113,16 +130,23 @@ } if (!allPAStatus) { - result.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); + result + .setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); } } catch (Exception e) { // if any exceptions occur, even runtime exceptions, return a failed // result - log.error("Exception while running the portlet application validator", e); - result.setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); - messages.append("Exception while running the portlet application validator: " + e.getMessage()); + log + .error( + "Exception while running the portlet application validator", + e); + result + .setHealthCheckResult(HealthCheckValidatorResult.VALIDATOR_FAILED); + messages + .append("Exception while running the portlet application validator: " + + e.getMessage()); } if (isDebugEnabled) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ChangePortletAction.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -156,6 +156,7 @@ .getPortletWindow(fragment); PortletMode currentMode = requestContext.getPortalURL() .getNavigationalState().getMode(window); + // TODO Findbugs WindowState currentState = requestContext.getPortalURL() .getNavigationalState().getState(window); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportJetspeedSchema.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -177,6 +177,7 @@ { String folder = getUserFolder(userName, false); File dir = new File(pageRoot + pathSeprator + userName + ".zip"); + // TODO Findbugs if (dir.exists()) dir.delete(); dir = new File(folder); @@ -202,6 +203,7 @@ } else { + // TODO Findbugs files[i].delete(); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/ExportObject.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -187,6 +187,7 @@ { String folder = getUserFolder(userName, false); File dir = new File(pageRoot + pathSeprator + userName + ".zip"); + // TODO Findbugs if (dir.exists()) dir.delete(); dir = new File(folder); @@ -212,6 +213,7 @@ } else { + // TODO Findbugs files[i].delete(); } } @@ -293,6 +295,7 @@ .length() + 1, strAbsPath.length()); byte[] b = new byte[(int) (cpFile.length())]; FileInputStream cpFileInputStream = new FileInputStream(cpFile); + // TODO Findbugs int i = cpFileInputStream.read(b, 0, (int) cpFile.length()); ZipEntry cpZipEntry = new ZipEntry(strZipEntryName); cpZipOutputStream.putNextEntry(cpZipEntry); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -51,6 +51,7 @@ AjaxAction, AjaxBuilder, Constants { + // TODO Findbugs protected Log log = LogFactory.getLog(GetUserInformationAction.class); public GetUserInformationAction(String template, String errorTemplate, Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityConstraintsBehavior.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -38,6 +38,7 @@ PortletActionSecurityBehavior { + // TODO Findbugs protected Log log = LogFactory .getLog(PortletActionSecurityConstraintsBehavior.class); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/PortletActionSecurityPathMergeBehavior.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -44,6 +44,7 @@ PortletActionSecurityBehavior { + // TODO Findbugs protected Log log = LogFactory .getLog(PortletActionSecurityPathMergeBehavior.class); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LogoutServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LogoutServlet.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/login/LogoutServlet.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -41,6 +41,7 @@ { destination = request.getContextPath() + "/"; } + // TODO Findbugs response.sendRedirect(response.encodeURL(destination)); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/manager/ManagerServlet.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -402,7 +402,9 @@ DiskFileUpload upload = new DiskFileUpload(); tempDir = File.createTempFile("upload", null); tempDir.deleteOnExit(); + // TODO Findbugs tempDir.delete(); + // TODO Findbugs tempDir.mkdirs(); tempDir.deleteOnExit(); List items = upload.parseRequest(request, 0, -1L, tempDir Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/pipeline/valve/HealthCheckValve.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -28,46 +28,61 @@ import org.apache.jetspeed.healthcheck.validators.HealthCheckValidator; import org.apache.jetspeed.healthcheck.validators.HealthCheckValidatorResult; import org.apache.jetspeed.pipeline.PipelineException; -import org.apache.jetspeed.pipeline.valve.AbstractValve; -import org.apache.jetspeed.pipeline.valve.ValveContext; import org.apache.jetspeed.request.RequestContext; /** - * Valve that performs a health check based on the validators injected from a Spring configutation file. + * Valve that performs a health check based on the validators injected from a + * Spring configutation file. * * @author Ruben Carvalho * @version $Id$ */ public class HealthCheckValve extends AbstractValve { + static final String LINE_SEPARATOR = System.getProperty("line.separator"); + private static final Log log = LogFactory.getLog(HealthCheckValve.class); + public static boolean isInfoEnabled = log.isInfoEnabled(); + + // TODO Findbugs public static boolean isDebugEnabled = log.isDebugEnabled(); + /** - * Spring property validators. List of validators to be executed by this Valve + * Spring property validators. List of validators to be executed by this + * Valve */ private List validators; + /** - * Spring property successMessage. This String is added to the response if all validators succeed + * Spring property successMessage. This String is added to the response if + * all validators succeed */ private String successMessage; + /** - * Spring property failMessage. The string to be added to the response if one of the validators fails + * Spring property failMessage. The string to be added to the response if + * one of the validators fails */ private String failMessage; + /** - * Spring property addValidationMessagesToResponse. Whether messages returned in the validator result should be - * appended to the http response or not + * Spring property addValidationMessagesToResponse. Whether messages + * returned in the validator result should be appended to the http response + * or not */ private boolean addValidationMessagesToResponse; + /** - * Spring property stopValidationOnError. Whether the valve execution should continue or stop if one validator fails + * Spring property stopValidationOnError. Whether the valve execution should + * continue or stop if one validator fails */ private boolean stopValidationOnError; - public HealthCheckValve(List validators, String successMessage, String failMessage, - boolean addValidationMessagesToResponse, boolean stopValidationOnError) + public HealthCheckValve(List validators, String successMessage, + String failMessage, boolean addValidationMessagesToResponse, + boolean stopValidationOnError) { this.validators = validators; this.successMessage = successMessage; @@ -76,7 +91,8 @@ this.stopValidationOnError = stopValidationOnError; } - public void invoke(RequestContext request, ValveContext context) throws PipelineException + public void invoke(RequestContext request, ValveContext context) + throws PipelineException { if (isDebugEnabled) { @@ -93,7 +109,8 @@ HealthCheckValidator hcv = (HealthCheckValidator) it.next(); if (isDebugEnabled) { - log.debug("Starting validator execution: " + hcv.getClass().getName()); + log.debug("Starting validator execution: " + + hcv.getClass().getName()); } HealthCheckValidatorResult result = null; // execute the validator until it succeeds or until the @@ -103,8 +120,9 @@ result = hcv.validate(); if (isDebugEnabled) { - log.debug("Validator execution: " + - (result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED)); + log + .debug("Validator execution: " + + (result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED)); } if (result.getHealthCheckResult() == HealthCheckValidatorResult.VALIDATOR_SUCCEEDED) { @@ -164,7 +182,7 @@ { for (Iterator it = messages.iterator(); it.hasNext();) { - pw.write(LINE_SEPARATOR + (String)it.next()); + pw.write(LINE_SEPARATOR + (String) it.next()); } } } @@ -185,7 +203,7 @@ { for (Iterator it = messages.iterator(); it.hasNext();) { - pw.write(LINE_SEPARATOR + (String)it.next()); + pw.write(LINE_SEPARATOR + (String) it.next()); } } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/profiler/impl/ProfilerValveImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -155,8 +155,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.pipeline.valve.Valve#invoke(org.apache.jetspeed.request.RequestContext, - * org.apache.jetspeed.pipeline.valve.ValveContext) + * @see + * org.apache.jetspeed.pipeline.valve.Valve#invoke(org.apache.jetspeed.request + * .RequestContext, org.apache.jetspeed.pipeline.valve.ValveContext) */ public void invoke(RequestContext request, ValveContext context) throws PipelineException @@ -199,6 +200,7 @@ { locators = profiler.getDefaultProfileLocators(request); } + // TODO Findbugs if (locators.size() == 0) { locators.put(ProfileLocator.PAGE_LOCATOR, profiler.getProfile( Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -138,6 +138,7 @@ this.request = request; this.response = response; this.config = config; + // TODO Findbugs this.session = request.getSession(); this.userInfoMgr = userInfoMgr; this.requestsForWindows = new HashMap(); @@ -448,7 +449,8 @@ // anymore, and as a WeakHashMap isn't // Serializable, "fixing" that problem (JS2-174) by simply not // putting it in the session anymore - // request.getSession().setAttribute(PortalReservedParameters.PREFERED_LANGUAGE_ATTRIBUTE, + // request.getSession().setAttribute(PortalReservedParameters. + // PREFERED_LANGUAGE_ATTRIBUTE, // new WeakHashMap()); session.setAttribute( PortalReservedParameters.PREFERED_LOCALE_ATTRIBUTE, locale); @@ -643,7 +645,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.request.RequestContext#setActionFailed(java.lang.Throwable) + * @see + * org.apache.jetspeed.request.RequestContext#setActionFailed(java.lang. + * Throwable) */ public void setActionFailure(PortletWindow window, Throwable actionFailure) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/Jetspeed1CredentialPasswordEncoder.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/Jetspeed1CredentialPasswordEncoder.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/security/impl/Jetspeed1CredentialPasswordEncoder.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -41,7 +41,8 @@ * Jetspeed1CredentialPasswordEncoder(String algorithm) { * this.passwordsAlgorithm = algorithm; } * - * public Jetspeed1CredentialPasswordEncoder(boolean dummy1, String dummy2) {} + * public Jetspeed1CredentialPasswordEncoder(boolean dummy1, String dummy2) + * {} */ public Jetspeed1CredentialPasswordEncoder() @@ -77,6 +78,7 @@ encodedStream.close(); return bas.toString(); } + // TODO Findbugs catch (Exception e) { // logger.error("Unable to encrypt password."+e.getMessage(), e); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/information/InformationProviderServiceImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -100,6 +100,7 @@ if (provider == null) { + // TODO Findbugs provider = new DynamicInformationProviderImpl(request, servletConfig); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/services/title/DynamicTitleService.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -20,6 +20,7 @@ import org.apache.pluto.om.window.PortletWindow; +// TODO Findbugs public interface DynamicTitleService extends org.apache.pluto.services.title.DynamicTitleService { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -581,6 +581,7 @@ log.debug("Register new portlet application " + contextName + "."); } + // TODO Findbugs pa = registerPortletApplication(paWar, pa, paType, paClassLoader); } @@ -755,6 +756,7 @@ paType, warStruct.getRootDirectory(), checksum); } } + // TODO Findbugs catch (Exception e) { String msg = "Error starting portlet application " + contextName; @@ -1152,6 +1154,7 @@ catch (InterruptedException e) { } + // TODO Findbugs while (started) { checkDescriptorChanges(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -157,6 +157,7 @@ } portletFactory.registerPortletApplication(regPA, paClassLoader); } + // TODO Findbugs catch (Exception e) { String msg = "Error starting portlet application " + contextName; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -83,6 +83,7 @@ { super(); + // TODO Findbugs if (!catalinaBase.endsWith("/")) { } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/CloneUtil.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/CloneUtil.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/CloneUtil.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -55,6 +55,7 @@ objectinputstream.close(); return clone; } + // TODO Findbugs catch (Exception exception) { // nothing Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/MimeType.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/MimeType.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/MimeType.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -33,7 +33,8 @@ public class MimeType { - public static final MimeType HTML = new MimeType("text/html", "UTF-8"); // FIXME: + public static final MimeType HTML = new MimeType("text/html", "UTF-8"); // FIXME + // : // test @@ -128,6 +129,7 @@ */ public boolean equals(Object obj) { + // TODO Findbugs if (this == obj) { return true; } if (obj instanceof MimeType) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationWar.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -70,8 +70,8 @@ *

* This class is utility class used mainly implementors of * {@link org.apache.jetspeed.pamanager.Deployment}and - * {@link org.apache.jetspeed.pamanager.Registration}to assist in deployment - * and undeployment of portlet applications. + * {@link org.apache.jetspeed.pamanager.Registration}to assist in deployment and + * undeployment of portlet applications. * * @author Scott T. Weaver * @author Matt Avery @@ -430,8 +430,8 @@ * * @param targetAppRoot * target to copy this WAR's content to. If the path ends in - * .war or .jar. The war will be - * copied into that file in jar format. + * .war or .jar. The war will be copied + * into that file in jar format. * @return PortletApplicationWar representing the newly created WAR. * @throws IOException */ @@ -539,9 +539,9 @@ *

* * Infuses this PortletApplicationWar's web.xml file with - * servlet and a servlet-mapping element for - * the JetspeedContainer servlet. This is only done if the descriptor does - * not already contain these items. + * servlet and a servlet-mapping element for the + * JetspeedContainer servlet. This is only done if the descriptor does not + * already contain these items. * * @throws MetaDataException * if there is a problem infusing @@ -590,6 +590,7 @@ writer.write(WEB_XML_STRING); writer.close(); doc = builder.build(file); + // TODO Findbugs file.delete(); } @@ -749,7 +750,7 @@ urls.add(jar.toURL()); } } - + // TODO Findbugs return new URLClassLoader((URL[]) urls.toArray(new URL[urls.size()]), parent); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerToolFactory.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -27,6 +27,7 @@ import org.apache.jetspeed.request.RequestContext; import org.apache.jetspeed.services.title.DynamicTitleService; +// TODO Findbugs public class JetspeedPowerToolFactory implements org.apache.jetspeed.layout.JetspeedPowerToolFactory { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -112,6 +112,7 @@ public long lastValidated; + // TODO Findbugs public VelocityEngineConfig(String decoration, String type, String mediaType, String language, String country) { @@ -136,9 +137,11 @@ private long cacheValidationInterval; /** default velocity engine */ + // TODO Findbugs private VelocityEngine defaultVelocityEngine; /** Velocity EventCartridge for handling event */ + // TODO Findbugs EventCartridge eventCartridge; /** @@ -267,7 +270,8 @@ /** * Handle the template processing request. * - * @see org.apache.velocity.tools.view.servlet.VelocityViewServlet.handleRequest() + * @see org.apache.velocity.tools.view.servlet.VelocityViewServlet.handleRequest + * () * * @param request * client request @@ -315,6 +319,7 @@ renderRequest.setAttribute(VELOCITY_CONTEXT_ATTR, ctx); } + // TODO Findbugs JetspeedVelocityPowerTool jpt = (JetspeedVelocityPowerTool) renderRequest .getAttribute(PortalReservedParameters.JETSPEED_POWER_TOOL_REQ_ATTRIBUTE); if (jpt == null) { throw new IllegalStateException( @@ -354,7 +359,8 @@ /** * Retrieves the requested template. * - * @see org.apache.velocity.tools.view.servlet.VelocityViewServlet.getTemplate() + * @see org.apache.velocity.tools.view.servlet.VelocityViewServlet.getTemplate + * () * * @param name * The file name of the template to retrieve relative to the @@ -390,7 +396,8 @@ /** * Retrieves the requested template with the specified character encoding. * - * @see org.apache.velocity.tools.view.servlet.VelocityViewServlet.getTemplate() + * @see org.apache.velocity.tools.view.servlet.VelocityViewServlet.getTemplate + * () * * @param name * The file name of the template to retrieve relative to the @@ -436,11 +443,13 @@ { RequestContext requestContext = (RequestContext) ctx .get("JS2RequestContext"); + // TODO Findbugs JetspeedDesktopContext desktopContext = (JetspeedDesktopContext) requestContext .getRequest().getAttribute( JetspeedDesktopContext.DESKTOP_CONTEXT_ATTRIBUTE); if (desktopContext != null) { + // TODO Findbugs if (defaultVelocityEngine == null) { defaultVelocityEngine = initVelocity((TemplateDescriptor) null); @@ -468,7 +477,8 @@ if (layoutDecoration == null) { // Page page = (Page) - // renderRequest.getAttribute(PortalReservedParameters.PAGE_ATTRIBUTE_KEY); + // renderRequest.getAttribute(PortalReservedParameters. + // PAGE_ATTRIBUTE_KEY); Page page = requestContext.getPage(); layoutDecoration = page .getEffectiveDefaultDecorator(layoutType); @@ -537,6 +547,7 @@ log.error("getVelocityEngine(): unable create base descriptor", tle); } + // TODO Findbugs descriptor.setMediaType(layoutMediaType); descriptor.setCountry(layoutCountry); descriptor.setLanguage(layoutLanguage); @@ -721,7 +732,8 @@ /** * Initialize new velocity instance using specified macros template. * - * @see org.apache.velocity.tools.view.servlet.VelocityViewServlet.initVelocity() + * @see org.apache.velocity.tools.view.servlet.VelocityViewServlet.initVelocity + * () * * @param macros * template descriptor. Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -166,10 +166,12 @@ // does not effect.. // userManager = (UserManager) // engine.getComponentManager().getComponent(UserManager.class); - // paContext.setAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT, + //paContext.setAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT + // , // userManager); // assertEquals(userManager, - // paContext.getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT)); + //paContext.getAttribute(CommonPortletServices.CPS_USER_MANAGER_COMPONENT + // )); } public static Test suite() @@ -340,7 +342,7 @@ urls.add(jar.toURL()); } } - + // TODO Findbugs localPAClassLoader = new URLClassLoader((URL[]) urls .toArray(new URL[urls.size()]), getClass().getClassLoader()); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -86,8 +86,8 @@ /** * Creates the test suite. * - * @return a test suite (TestSuite) that includes all - * methods starting with "test" + * @return a test suite (TestSuite) that includes all methods + * starting with "test" */ public static Test suite() { @@ -142,7 +142,8 @@ * new ArrayList(2); eventListeners.add(ddel); eventListeners.add(dpal); // * Use a -1 delay to disable auto scan StandardDeploymentManager * autoDeployment = new - * StandardDeploymentManager(deploySrc.getAbsolutePath(), -1, eventListeners ); + * StandardDeploymentManager(deploySrc.getAbsolutePath(), -1, eventListeners + * ); * * autoDeployment.start(); autoDeployment.fireDeploymentEvent(); * @@ -221,8 +222,8 @@ * * eventListeners.add(dpal); // Use a -1 delay to disable auto scan * StandardDeploymentManager autoDeployment = new - * StandardDeploymentManager(deploySrc.getAbsolutePath(), -1, eventListeners ); - * autoDeployment.start(); + * StandardDeploymentManager(deploySrc.getAbsolutePath(), -1, eventListeners + * ); autoDeployment.start(); * * buildEntityTestData(autoDeployment); * @@ -327,11 +328,12 @@ * * @param demoApp * - * private void verifyDemoAppDeleted( String appName, File appFile ) { - * assertNull(appName + " was not removed from the registry.", - * portletRegistry - * .getPortletApplicationByIdentifier(TEST_PORTLET_APP_NAME)); - * assertFalse(appName+" directory was not deleted.", appFile.exists()); } + * private void verifyDemoAppDeleted( String appName, File + * appFile ) { assertNull(appName + + * " was not removed from the registry.", portletRegistry + * .getPortletApplicationByIdentifier(TEST_PORTLET_APP_NAME)); + * assertFalse(appName+" directory was not deleted.", + * appFile.exists()); } */ /** @@ -345,6 +347,7 @@ super.setUp(); copyFrom = new File("./test/deployment/deploy"); deploySrc = new File("./target/deployment/deploy"); + // TODO Findbugs deploySrc.mkdirs(); deployRootFile = new File( "./target/deployment/templates/decorators"); @@ -399,6 +402,7 @@ if (child.isFile()) { File toFile = new File(dstDir, child.getName()); + // TODO Findbugs toFile.createNewFile(); FileChannel srcChannel = new FileInputStream(child) .getChannel(); @@ -411,6 +415,7 @@ else { File newSubDir = new File(dstDir, child.getName()); + // TODO Findbugs newSubDir.mkdir(); copyFiles(child, newSubDir); } @@ -430,7 +435,8 @@ * try { DirectoryHelper dirHelper = new DirectoryHelper(new * File(webAppsDir + "/" + TEST_PORTLET_APP_NAME)); paWar1 = new * PortletApplicationWar(dirHelper, TEST_PORTLET_APP_NAME, "/" + - * TEST_PORTLET_APP_NAME); pam.undeploy(paWar1); } catch (Exception e1) { } + * TEST_PORTLET_APP_NAME); pam.undeploy(paWar1); } catch (Exception e1) + * { } * * pam.unregister("jetspeed"); * Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/window/TestWindows.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/window/TestWindows.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/test/org/apache/jetspeed/window/TestWindows.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -166,6 +166,7 @@ /** * @param arg0 */ + // TODO Findbugs public ListAppendStub(List list) { super("Appends object to a list"); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -87,6 +87,7 @@ public MenuImpl(MenuImpl parent, MenuDefinition definition, PortalSiteRequestContextImpl context, Set menus) { + // TODO Findbugs super(parent); this.definition = definition; @@ -1163,8 +1164,8 @@ * orderRegexpPattern - tests for and converts simple order wildcard and * character class regular exressions to perl5/standard java pattern syntax * - * @param regexp - - * candidate order regular expression + * @param regexp + * - candidate order regular expression * @return - converted pattern */ private static String orderRegexpPattern(String regexp) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuOptionImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -54,6 +54,7 @@ public MenuOptionImpl(MenuImpl parent, Node node, MenuOptionsDefinition definition) { + // TODO Findbugs super(parent, node); this.definition = definition; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuSeparatorImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuSeparatorImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/MenuSeparatorImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -48,6 +48,7 @@ */ public MenuSeparatorImpl(MenuImpl parent, MenuSeparatorDefinition definition) { + // TODO Findbugs super(parent); this.definition = definition; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -129,6 +129,7 @@ * store which pipeline we are serving * */ + // TODO Findbugs private transient String pipeline = ""; /** @@ -836,6 +837,7 @@ else if (locatorsUpdate) { debug.append("Updated locators"); + // TODO Findbugs if (stale) { debug.append("/stale"); @@ -1034,6 +1036,7 @@ */ public Map getMenuDefinitionLocatorCache() { + // TODO Findbugs return menuDefinitionLocatorCache; } @@ -1123,9 +1126,9 @@ * request profile locator * @return request path * - * private static String locatorRequestPath(ProfileLocator locator) { // use - * request path in locator as default return locatorRequestPath(locator, - * locator.getRequestPath()); } + * private static String locatorRequestPath(ProfileLocator locator) + * { // use request path in locator as default return + * locatorRequestPath(locator, locator.getRequestPath()); } */ /** @@ -1137,35 +1140,41 @@ * request path * @return request path * - * private static String locatorRequestPath(ProfileLocator locator, String - * requestPath) { // search locator using the most specific, // (i.e. - * first), locator properties array // returned by the locator iterator and - * return // first valued property that is not a control // or navigation - * type ProfileLocatorProperty [] properties = (ProfileLocatorProperty - * [])locator.iterator().next(); for (int i = 0, limit = properties.length; - * (i < limit); i++) { if (!properties[i].isControl() && - * !properties[i].isNavigation() && (properties[i].getValue() != null)) { // - * use specified locator path String locatorPath = properties[i].getValue(); // - * return specified locatorPath if absolute if - * (locatorPath.startsWith(Folder.PATH_SEPARATOR)) { return locatorPath; } // - * page names and relative paths are assumed relative to // request path and - * that any locator paths with no url // separator should have the page - * extension appended // get default page if page path null if - * ((locatorPath.indexOf(Folder.PATH_SEPARATOR) == -1) && - * !locatorPath.endsWith(Page.DOCUMENT_TYPE)) { locatorPath += - * Page.DOCUMENT_TYPE; } // append locator path to request path, replacing // - * requested pages and preserving requested folders boolean - * rootFolderRequest = requestPath.equals(Folder.PATH_SEPARATOR); boolean - * folderRequest = (!requestPath.endsWith(Page.DOCUMENT_TYPE)); int - * lastSeparatorIndex = requestPath.lastIndexOf(Folder.PATH_SEPARATOR_CHAR); - * if ((lastSeparatorIndex > 0) && (!folderRequest || - * requestPath.endsWith(Folder.PATH_SEPARATOR))) { // append locator to - * request path base path return requestPath.substring(0, - * lastSeparatorIndex) + Folder.PATH_SEPARATOR + locatorPath; } else if - * (!rootFolderRequest && folderRequest) { // append locator to request path - * root folder return requestPath + Folder.PATH_SEPARATOR + locatorPath; } - * else { // use root folder locator return Folder.PATH_SEPARATOR + - * locatorPath; } } } return requestPath; } + * private static String locatorRequestPath(ProfileLocator locator, + * String requestPath) { // search locator using the most specific, + * // (i.e. first), locator properties array // returned by the + * locator iterator and return // first valued property that is not + * a control // or navigation type ProfileLocatorProperty [] + * properties = (ProfileLocatorProperty + * [])locator.iterator().next(); for (int i = 0, limit = + * properties.length; (i < limit); i++) { if + * (!properties[i].isControl() && !properties[i].isNavigation() && + * (properties[i].getValue() != null)) { // use specified locator + * path String locatorPath = properties[i].getValue(); // return + * specified locatorPath if absolute if + * (locatorPath.startsWith(Folder.PATH_SEPARATOR)) { return + * locatorPath; } // page names and relative paths are assumed + * relative to // request path and that any locator paths with no + * url // separator should have the page extension appended // get + * default page if page path null if + * ((locatorPath.indexOf(Folder.PATH_SEPARATOR) == -1) && + * !locatorPath.endsWith(Page.DOCUMENT_TYPE)) { locatorPath += + * Page.DOCUMENT_TYPE; } // append locator path to request path, + * replacing // requested pages and preserving requested folders + * boolean rootFolderRequest = + * requestPath.equals(Folder.PATH_SEPARATOR); boolean folderRequest + * = (!requestPath.endsWith(Page.DOCUMENT_TYPE)); int + * lastSeparatorIndex = + * requestPath.lastIndexOf(Folder.PATH_SEPARATOR_CHAR); if + * ((lastSeparatorIndex > 0) && (!folderRequest || + * requestPath.endsWith(Folder.PATH_SEPARATOR))) { // append locator + * to request path base path return requestPath.substring(0, + * lastSeparatorIndex) + Folder.PATH_SEPARATOR + locatorPath; } else + * if (!rootFolderRequest && folderRequest) { // append locator to + * request path root folder return requestPath + + * Folder.PATH_SEPARATOR + locatorPath; } else { // use root folder + * locator return Folder.PATH_SEPARATOR + locatorPath; } } } return + * requestPath; } */ /** Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesFactoryImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -33,6 +33,7 @@ public class PreferencesFactoryImpl implements PreferencesFactory { + // TODO Findbugs protected static PreferencesProvider prefsProvider; public PreferencesFactoryImpl() @@ -70,8 +71,10 @@ try { PreferencesImpl.setPreferencesProvider(prefsProvider); + // TODO Findbugs PreferencesImpl.systemRoot = new PreferencesImpl(null, "", PreferencesImpl.SYSTEM_NODE_TYPE); + // TODO Findbugs PreferencesImpl.userRoot = new PreferencesImpl(null, "", PreferencesImpl.USER_NODE_TYPE); } @@ -101,6 +104,7 @@ */ public void setPrefsProvider(PreferencesProvider prefsProvider) { + // TODO Findbugs PreferencesFactoryImpl.prefsProvider = prefsProvider; } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/om/impl/NodeImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/om/impl/NodeImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/om/impl/NodeImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -246,6 +246,7 @@ public boolean equals(Object o) { + // TODO Findbugs return fullPath != null && o != null && o instanceof NodeImpl && ((NodeImpl) o).fullPath != null && fullPath.equals(((NodeImpl) o).fullPath); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/prefs/src/test/org/apache/jetspeed/prefs/TestPreferences.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -79,6 +79,7 @@ } else { + // TODO Findbugs assertTrue("expected user root == '/', " + prefs, false); } } @@ -98,6 +99,7 @@ } else { + // TODO Findbugs assertTrue("expected system root == '/', " + prefs, false); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/DomainCriterionResolver.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/DomainCriterionResolver.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/DomainCriterionResolver.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -33,7 +33,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.profiler.rules.impl.StandardResolver#isControl(org.apache.jetspeed.profiler.rules.RuleCriterion) + * @see + * org.apache.jetspeed.profiler.rules.impl.StandardResolver#isControl(org + * .apache.jetspeed.profiler.rules.RuleCriterion) */ public boolean isControl(RuleCriterion criterion) { @@ -43,7 +45,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.profiler.rules.impl.StandardResolver#isNavigation(org.apache.jetspeed.profiler.rules.RuleCriterion) + * @see + * org.apache.jetspeed.profiler.rules.impl.StandardResolver#isNavigation + * (org.apache.jetspeed.profiler.rules.RuleCriterion) */ public boolean isNavigation(RuleCriterion criterion) { @@ -78,6 +82,7 @@ // maybe there is no domain // testing for IPv6 IP Address idx = servername.indexOf(":"); + // TODO Findbugs if (idx != -1) { // TODO resolving IP Address? Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RuleCriterionImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RuleCriterionImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RuleCriterionImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -62,6 +62,7 @@ */ public boolean equals(Object o) { + // TODO Findbugs if (this == o) return true; if ((o == null) || (!(o instanceof RuleCriterion))) return false; RuleCriterion r = (RuleCriterion) o; @@ -92,7 +93,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.profiler.rules.RuleCriterion#setType(java.lang.String) + * @see + * org.apache.jetspeed.profiler.rules.RuleCriterion#setType(java.lang.String + * ) */ public void setType(String type) { @@ -112,7 +115,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.profiler.rules.RuleCriterion#setName(java.lang.String) + * @see + * org.apache.jetspeed.profiler.rules.RuleCriterion#setName(java.lang.String + * ) */ public void setName(String name) { @@ -132,7 +137,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.profiler.rules.RuleCriterion#setRuleId(java.lang.String) + * @see + * org.apache.jetspeed.profiler.rules.RuleCriterion#setRuleId(java.lang. + * String) */ public void setRuleId(String ruleId) { @@ -162,7 +169,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.profiler.rules.RuleCriterion#setFallbackOrder(int) + * @see + * org.apache.jetspeed.profiler.rules.RuleCriterion#setFallbackOrder(int) */ public void setFallbackOrder(int i) { @@ -172,7 +180,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.profiler.rules.RuleCriterion#setValue(java.lang.String) + * @see + * org.apache.jetspeed.profiler.rules.RuleCriterion#setValue(java.lang.String + * ) */ public void setValue(String value) { @@ -192,7 +202,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.profiler.rules.RuleCriterion#setFallbackType(int) + * @see + * org.apache.jetspeed.profiler.rules.RuleCriterion#setFallbackType(int) */ public void setFallbackType(int i) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -55,8 +55,8 @@ * If a JNDI name is set, the bean automatically configures a JDBC connection * descriptor with a connection factory of type * ConnectionFactoryManagedImpl, else it uses - * ConectionFactoryDBCPImpl. This may be overridden my setting - * the connection factory property explicitly. + * ConectionFactoryDBCPImpl. This may be overridden my setting the + * connection factory property explicitly. *

* * Properties "driverClassName", "url", "username" and "password" are used only @@ -65,8 +65,8 @@ *

* * The bean derives the RDBMS platform setting from the configured data source - * or database driver using OJB's JdbcMetadataUtils class. At - * least until OJB 1.0.3, however, this class does not properly distinguish the + * or database driver using OJB's JdbcMetadataUtils class. At least + * until OJB 1.0.3, however, this class does not properly distinguish the * platforms "Oracle" and "Oracle9i"; it always assigns "Oracle". In case of * "Oracle", this bean therefore opens a connection, obtains the version * information from the database server and adjusts the platform accordingly. @@ -266,10 +266,10 @@ } /** - * Sets the attribute "org.apache.jetspeed.engineScoped" of - * the JDBC connection descriptor to "true" or "false". - * If set, JNDI lookups of the connection will be done using the environment - * naming context (ENC) of the Jetspeed engine. + * Sets the attribute "org.apache.jetspeed.engineScoped" of the + * JDBC connection descriptor to "true" or "false + * ". If set, JNDI lookups of the connection will be done using the + * environment naming context (ENC) of the Jetspeed engine. * * @param jetspeedEngineScoped * whether to use Jetspeed engine's ENC. @@ -457,6 +457,7 @@ * a minimal DataSource implementation that satisfies the requirements of * JdbcMetadataUtil. */ + // TODO Findbugs private class MinimalDataSource implements DataSource { @@ -469,17 +470,19 @@ { this.jcd = jcd; } + public boolean isWrapperFor(Class iface) throws SQLException { return false; // #ifdef JDBC4 return getConnection().isWrapperFor(iface); } - + T unwrap(Class iface) throws SQLException { throw new SQLException("PoolingDataSource is not a wrapper."); // #ifdef JDBC4 return getConnection().unwrap(iface); } + /* * (non-Javadoc) * Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletregistry/PersistenceBrokerPortletRegistry.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -86,6 +86,7 @@ // for testing purposes only: no need for the portletFactory then public PersistenceBrokerPortletRegistry(String repositoryPath) { + // TODO Findbugs this(repositoryPath, null, null, null, null, null); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/GenericMetadataImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -42,6 +42,7 @@ private MultiValueMap getFieldMap(boolean create) { + // TODO Findbugs if (fieldMap == null && create) { synchronized (this) @@ -58,8 +59,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.GenericMetadata#addField(java.util.Locale, - * java.lang.String, java.lang.String) + * @see + * org.apache.jetspeed.om.common.GenericMetadata#addField(java.util.Locale, + * java.lang.String, java.lang.String) */ public void addField(Locale locale, String name, String value) { @@ -74,7 +76,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.GenericMetadata#addField(org.apache.jetspeed.om.common.LocalizedField) + * @see + * org.apache.jetspeed.om.common.GenericMetadata#addField(org.apache.jetspeed + * .om.common.LocalizedField) */ public void addField(LocalizedField field) { @@ -90,7 +94,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.GenericMetadata#getFields(java.lang.String) + * @see + * org.apache.jetspeed.om.common.GenericMetadata#getFields(java.lang.String) */ public Collection getFields(String name) { @@ -102,8 +107,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.GenericMetadata#setFields(java.lang.String, - * java.util.Collection) + * @see + * org.apache.jetspeed.om.common.GenericMetadata#setFields(java.lang.String, + * java.util.Collection) */ public void setFields(String name, Collection values) { @@ -150,7 +156,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.GenericMetadata#setFields(java.util.Collection) + * @see + * org.apache.jetspeed.om.common.GenericMetadata#setFields(java.util.Collection + * ) */ public void setFields(Collection fields) { @@ -180,7 +188,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.GenericMetadata#copyFields(java.util.Collection) + * @see + * org.apache.jetspeed.om.common.GenericMetadata#copyFields(java.util.Collection + * ) */ public void copyFields(Collection fields) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -147,6 +147,7 @@ LanguageImpl language = new LanguageImpl(); language.setLocale(locale); + // TODO Findbugs language.setTitle(fallback.getTitle()); language.setShortTitle(fallback.getShortTitle()); language.setKeywords(fallback.getKeywordStr()); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/ParameterImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -93,6 +93,7 @@ */ public boolean equals(Object obj) { + // TODO Findbugs if (obj != null && obj.getClass().equals(getClass())) { ParameterImpl p = (ParameterImpl) obj; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/portlet/impl/PortletDefinitionImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -155,6 +155,7 @@ /** Metadata property */ private Collection metadataFields = null; + // TODO Findbugs private PrefsPreferenceSetImpl preferenceSet; private String jetspeedSecurityConstraint = null; @@ -422,38 +423,33 @@ /* * public void addUserAttribute(UserAttribute userAttribute) { * this.userAttributeSet.add(userAttribute); } - * *//** - * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setUserAttributeSet(java.util.Collection) - */ + * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setUserAttributeSet(java.util.Collection) + */ /* * public void setUserAttributeSet(Collection userAttributeSet) { * this.userAttributeSet = userAttributeSet; } - * *//** - * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUserAttributeSet() - */ + * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUserAttributeSet() + */ /* * public Collection getUserAttributeSet() { return this.userAttributeSet; } - * *//** - * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef) - */ + * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#addUserAttributeRef(org.apache.jetspeed.om.common.UserAttributeRef) + */ /* * public void addUserAttributeRef(UserAttributeRef userAttributeRef) { * System.out.println("_______IN addUserAttributeRef"); * this.userAttributeRefSet.add(userAttributeRef); } - * *//** - * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setUserAttributeSet(java.util.Collection) - */ + * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setUserAttributeSet(java.util.Collection) + */ /* * public void setUserAttributeRefSet(Collection userAttributeRefSet) { * this.userAttributeRefSet = userAttributeRefSet; } - * *//** - * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUserAttributeRefSet() - */ + * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getUserAttributeRefSet() + */ /* * public Collection getUserAttributeRefSet() { return * this.userAttributeRefSet; } @@ -654,8 +650,8 @@ * * @param locale * Locale to get the display name for - * @return Localized text string of the display name or null - * if no DisplayName exists for this locale + * @return Localized text string of the display name or null if + * no DisplayName exists for this locale */ public String getDisplayNameText(Locale locale) { @@ -669,8 +665,8 @@ * * @param locale * Locale to get the description for - * @return Localized text string of the display name or null - * if no Description exists for this locale + * @return Localized text string of the display name or null if + * no Description exists for this locale */ public String getDescriptionText(Locale locale) { @@ -982,7 +978,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#getJetspeedSecurityConstraint() + * @seeorg.apache.jetspeed.om.common.portlet.PortletDefinitionComposite# + * getJetspeedSecurityConstraint() */ public String getJetspeedSecurityConstraint() { @@ -992,7 +989,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite#setJetspeedSecurityConstraint(java.lang.String) + * @seeorg.apache.jetspeed.om.common.portlet.PortletDefinitionComposite# + * setJetspeedSecurityConstraint(java.lang.String) */ public void setJetspeedSecurityConstraint(String constraint) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/preference/impl/PrefsPreference.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -516,6 +516,7 @@ */ public String toString() { + // TODO Findbugs return "Preference{" + name + "} values=" + getValueArray().toString(); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -75,6 +75,7 @@ protected void tearDown() throws Exception { + // TODO Findbugs teardownTestData(); } @@ -90,7 +91,13 @@ .getPortletApplication(TEST_APP); assertNotNull("Portlet Application", pa); System.out.println("pa = " + pa.getId()); - PortletDefinitionList portlets = pa.getPortletDefinitionList(); // .get(JetspeedObjectID.createFromString(TEST_PORTLET)); + PortletDefinitionList portlets = pa.getPortletDefinitionList(); // .get( + // JetspeedObjectID + // . + // createFromString + // ( + // TEST_PORTLET + // )); Iterator pi = portlets.iterator(); PortletDefinitionComposite pd = null; while (pi.hasNext()) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/AbstractRegistryTest.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -87,6 +87,7 @@ protected void tearDown() throws Exception { // super.tearDown(); + // TODO Findbugs } protected void validateDublinCore(GenericMetadata metadata) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestPortletRegistryDAO.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -96,6 +96,7 @@ */ protected void tearDown() throws Exception { + // TODO Findbugs Iterator itr = portletRegistry.getPortletApplications().iterator(); while (itr.hasNext()) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/TestRegistryCache.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -48,7 +48,8 @@ *

* * @author Scott T. Weaver - * @version $Id: TestPortletRegistryDAO.java 506825 2007-02-13 02:47:07Z taylor $ + * @version $Id: TestPortletRegistryDAO.java 506825 2007-02-13 02:47:07Z taylor + * $ */ public class TestRegistryCache extends DatasourceEnabledSpringTestCase { @@ -74,6 +75,7 @@ .getPortletApplication("PA-001"); MutablePortletApplication cached = MutablePortletApplicationProxy .createProxy(app); + // TODO Findbugs if (cached instanceof MutablePortletApplication) System.out.println("ISA Mutable"); if (cached instanceof PortletApplicationProxy) @@ -188,6 +190,7 @@ */ protected void tearDown() throws Exception { + // TODO Findbugs Iterator itr = portletRegistry.getPortletApplications().iterator(); while (itr.hasNext()) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectAll.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -78,6 +78,7 @@ protected void tearDown() throws Exception { // super.tearDown(); + // TODO Findbugs } /** Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1a.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -75,6 +75,7 @@ protected void tearDown() throws Exception { // super.tearDown(); + // TODO Findbugs } /** Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1b.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1b.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/registry/src/test/org/apache/jetspeed/components/portletregistry/direct/TestRegistryDirectPart1b.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -51,6 +51,7 @@ protected void tearDown() throws Exception { // super.tearDown(); + // TODO Findbugs } public static Test suite() Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/java/org/apache/jetspeed/rewriter/html/neko/URLRewriterFilter.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -104,6 +104,7 @@ protected void rewriteAttribute(String attrName, XMLAttributes attributes) { + // TODO Findbugs String uri = attributes.getValue(attrName); if (uri != null) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestNekoRewriter.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -84,7 +84,8 @@ * target ) ; * * DOMParser parser = new DOMParser() ; parser.parse( target ) ; - * System.out.println( "parse() result..." ) ; print( parser.getDocument(), "" ) ; } + * System.out.println( "parse() result..." ) ; print( parser.getDocument(), + * "" ) ; } * * void print( Node node, String indent ) { * System.out.println(indent+node.getClass().getName()); Node child = @@ -102,8 +103,9 @@ * * SAXParser parser = new SAXParser() ; // create pipeline filters * org.cyberneko.html.filters.Writer writer = new - * org.cyberneko.html.filters.Writer(); Purifier purifier = new Purifier() ; // - * setup filter chain XMLDocumentFilter[] filters = { purifier, writer, }; + * org.cyberneko.html.filters.Writer(); Purifier purifier = new Purifier() ; + * // setup filter chain XMLDocumentFilter[] filters = { purifier, writer, + * }; * * parser.setProperty("http://cyberneko.org/html/properties/filters", * filters); // parse documents XMLInputSource source = new @@ -169,6 +171,7 @@ */ private FileWriter getTestWriter(String filename) throws IOException { + // TODO Findbugs new File("target/test/rewriter").mkdirs(); return new FileWriter("target/test/rewriter/" + filename); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rewriter/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -270,6 +270,7 @@ */ private FileWriter getTestWriter(String filename) throws IOException { + // TODO Findbugs new File("target/test/rewriter").mkdirs(); return new FileWriter("target/test/rewriter/" + filename); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/search/src/test/org/apache/jetspeed/search/TestSearch.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/search/src/test/org/apache/jetspeed/search/TestSearch.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/search/src/test/org/apache/jetspeed/search/TestSearch.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -75,8 +75,8 @@ /** * Creates the test suite. * - * @return a test suite (TestSuite) that includes all - * methods starting with "test" + * @return a test suite (TestSuite) that includes all methods + * starting with "test" */ public static Test suite() { @@ -105,6 +105,7 @@ for (int i = 0; i < indexFiles.length; i++) { File file = indexFiles[i]; + // TODO Findbugs file.delete(); } } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/LoginModuleProxyImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/LoginModuleProxyImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/LoginModuleProxyImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -59,6 +59,7 @@ // Hack providing access to the UserManager in the LoginModule. // TODO Can we fix this? + // TODO Findbugs LoginModuleProxyImpl.loginModuleProxy = this; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserPrincipalImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserPrincipalImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/impl/UserPrincipalImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -80,6 +80,7 @@ */ public boolean equals(Object another) { + // TODO Findbugs if (!(another instanceof UserPrincipalImpl)) return false; UserPrincipalImpl principal = (UserPrincipalImpl) another; return this.getName().equals(principal.getName()); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalCredentialImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalCredentialImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalCredentialImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -165,7 +165,9 @@ } /* - * @see org.apache.jetspeed.security.om.InternalCredential#setUpdateRequired(boolean) + * @see + * org.apache.jetspeed.security.om.InternalCredential#setUpdateRequired( + * boolean) */ public void setUpdateRequired(boolean updateRequired) { @@ -380,6 +382,7 @@ */ public boolean equals(Object object) { + // TODO Findbugs if (!(object instanceof InternalCredential)) return false; InternalCredential c = (InternalCredential) object; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalGroupPrincipalImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalGroupPrincipalImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalGroupPrincipalImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -111,6 +111,7 @@ */ public boolean equals(Object object) { + // TODO Findbugs if (!(object instanceof InternalGroupPrincipal)) return false; InternalGroupPrincipal r = (InternalGroupPrincipal) object; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalPermissionImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalPermissionImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalPermissionImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -195,6 +195,7 @@ */ public boolean equals(Object object) { + // TODO Findbugs if (!(object instanceof InternalPermission)) return false; InternalPermission p = (InternalPermission) object; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalRolePrincipalImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalRolePrincipalImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalRolePrincipalImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -109,6 +109,7 @@ */ public boolean equals(Object object) { + // TODO Findbugs if (!(object instanceof InternalRolePrincipal)) return false; InternalRolePrincipal r = (InternalRolePrincipal) object; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalUserPrincipalImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalUserPrincipalImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/om/impl/InternalUserPrincipalImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -134,6 +134,7 @@ */ public boolean equals(Object object) { + // TODO Findbugs if (!(object instanceof InternalUserPrincipal)) return false; InternalUserPrincipal r = (InternalUserPrincipal) object; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapContextProxy.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapContextProxy.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/spi/impl/ldap/LdapContextProxy.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -113,7 +113,7 @@ * (non-Javadoc) * * @see java.lang.reflect.InvocationHandler#invoke(java.lang.Object, - * java.lang.reflect.Method, java.lang.Object[]) + * java.lang.reflect.Method, java.lang.Object[]) */ public synchronized Object invoke(Object proxy, Method m, Object[] args) throws Throwable @@ -151,6 +151,7 @@ try { ctx = getCtx(); + // TODO Findbugs result = m.invoke(ctx, args); } catch (Throwable t2) Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/util/GullibleSSLSocketFactory.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/util/GullibleSSLSocketFactory.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/security/src/java/org/apache/jetspeed/security/util/GullibleSSLSocketFactory.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -44,6 +44,7 @@ public class GullibleSSLSocketFactory extends SSLSocketFactory { + // TODO Findbugs class GullibleTrustManager implements X509TrustManager { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedDDLApplication.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedDDLApplication.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/serializer/src/java/org/apache/jetspeed/serializer/JetspeedDDLApplication.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -427,6 +427,7 @@ { System.err.println("Failed to initialize Utility!!!!!"); e.printStackTrace(); + // TODO Findbugs System.exit(-1); } try @@ -810,6 +811,7 @@ return snap; } + // TODO Findbugs class LocalFilenameFilter implements FilenameFilter { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/sso/src/test/org/apache/jetspeed/sso/TestSSOComponent.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -74,6 +74,7 @@ try { + // TODO Findbugs ssoBroker = (SSOProvider) ctx.getBean("ssoProvider"); } catch (Exception ex) @@ -88,6 +89,7 @@ */ public void tearDown() throws Exception { + // TODO Findbugs clean(); // super.tearDown(); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/java/org/apache/jetspeed/statistics/impl/UserStatsImpl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -72,7 +72,8 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.statistics.UserStats#setUsername(java.lang.String) + * @see + * org.apache.jetspeed.statistics.UserStats#setUsername(java.lang.String) */ public void setUsername(String username) { @@ -93,7 +94,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.statistics.UserStats#setInetAddress(java.net.InetAddress) + * @see + * org.apache.jetspeed.statistics.UserStats#setInetAddress(java.net.InetAddress + * ) */ public void setInetAddress(InetAddress inetAddress) { @@ -103,7 +106,9 @@ /* * (non-Javadoc) * - * @see org.apache.jetspeed.statistics.UserStats#setInetAddressFromIp(java.lang.String) + * @see + * org.apache.jetspeed.statistics.UserStats#setInetAddressFromIp(java.lang + * .String) */ public void setInetAddressFromIp(String ip) throws UnknownHostException { @@ -119,7 +124,7 @@ */ public boolean equals(Object obj) { - + // TODO Findbugs if (!(obj instanceof UserStats)) return false; UserStats userstat = (UserStats) obj; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/test/org/apache/jetspeed/audit/TestAuditActivity.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/test/org/apache/jetspeed/audit/TestAuditActivity.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/test/org/apache/jetspeed/audit/TestAuditActivity.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -77,6 +77,7 @@ { Connection con = audit.getDataSource().getConnection(); + // TODO Findbugs PreparedStatement psmt = con .prepareStatement("DELETE FROM ADMIN_ACTIVITY"); psmt.execute(); @@ -99,6 +100,7 @@ { Connection con = audit.getDataSource().getConnection(); + // TODO Findbugs PreparedStatement psmt = con.prepareStatement(query); ResultSet rs = psmt.executeQuery(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/statistics/src/test/org/apache/jetspeed/statistics/TestStatistics.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -90,6 +90,7 @@ try { + // TODO Findbugs DatabaseMetaData dmd = statistics.getDataSource().getConnection() .getMetaData(); System.out @@ -100,6 +101,7 @@ Connection con = statistics.getDataSource().getConnection(); + // TODO Findbugs PreparedStatement psmt = con .prepareStatement("DELETE FROM USER_STATISTICS"); psmt.execute(); @@ -125,6 +127,7 @@ { Connection con = statistics.getDataSource().getConnection(); + // TODO Findbugs PreparedStatement psmt = con.prepareStatement(query); ResultSet rs = psmt.executeQuery(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/WebContentPortlet.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -705,10 +705,12 @@ // propagate User-Agent, so target site does not think we are a D.O.S. // attack + // TODO Findbugs httpMethod.addRequestHeader("User-Agent", useragentProperty); // BOZO - DON'T do this. default policy seems to be more flexible!!! - // httpMethod.getParams().setCookiePolicy(CookiePolicy.BROWSER_COMPATIBILITY); + // httpMethod.getParams().setCookiePolicy(CookiePolicy. + // BROWSER_COMPATIBILITY); // ...ready to use! return httpMethod; @@ -759,6 +761,7 @@ try { is.mark(BLOCK_SIZE); + // TODO Findbugs is.read(buf, 0, BLOCK_SIZE); String content = new String(buf, "ISO-8859-1"); String lowerCaseContent = content.toLowerCase(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentHistoryPage.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -65,6 +65,7 @@ public boolean equals(Object o) { + // TODO Findbugs if (o == null || !(o instanceof WebContentHistoryPage)) return false; WebContentHistoryPage page = (WebContentHistoryPage) o; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentResource.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentResource.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/web-content/src/java/org/apache/jetspeed/portlet/webcontent/WebContentResource.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -30,6 +30,7 @@ public class WebContentResource implements Serializable { + // TODO Findbugs private transient byte[] content = null; private String url = null; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/IsolatedLog4JLogger.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/IsolatedLog4JLogger.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/IsolatedLog4JLogger.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -26,8 +26,7 @@ /** * IsolatedLog4JLogger routes all commons-logging logging using Log4J to an - * ContextClassLoader specific Hierarchy. - *

+ * ContextClassLoader specific Hierarchy.

*

* For web or application servers providing (and enforcing) commons-logging and * Log4J from a shared context (like JBoss), configuring Log4J loggers and @@ -37,8 +36,8 @@ *

* Capturing root logging for logging events from within the web application for * example isn't possible using a Log4J propery or xml configuration without - * routing ALL root logging through the new (web application - * specific) configuration. + * routing ALL root logging through the new (web application specific) + * configuration. *

*

* It is possible using the Log4J API directly instead of configuration files, @@ -95,11 +94,10 @@ *

*

* TODO: It might be useful to have this utility class available for usage by - * Portlet Applications too. Because this class must be included - * within a web application classpath, a separate jetspeed-tools or - * jetspeed-utils library will have to be created for it (and possibly other - * utility classes as well) which then can be put in the web application lib - * folder. + * Portlet Applications too. Because this class must be included within + * a web application classpath, a separate jetspeed-tools or jetspeed-utils + * library will have to be created for it (and possibly other utility classes as + * well) which then can be put in the web application lib folder. *

* * @author Ate Douma @@ -155,6 +153,7 @@ // Temporarily save this instance so it can be // rerouted one the Hierarchy is set. logger = new Log4JLogger(name); + // TODO Findbugs notIsolatedLoggers.put(this, name); } else @@ -194,6 +193,7 @@ public boolean equals(Object obj) { + // TODO Findbugs Log4JLogger logger = getLogger(); return logger != null ? logger.equals(obj) : false; } @@ -291,6 +291,7 @@ public String toString() { Log4JLogger logger = getLogger(); + // TODO Findbugs return logger != null ? logger.toString() : null; } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/Log4JConfigurator.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/Log4JConfigurator.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/webapp-logging/src/java/org/apache/jetspeed/webapp/logging/Log4JConfigurator.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -83,6 +83,7 @@ isolatedHierarchy = new Hierarchy(new RootCategory(Level.INFO)); new PropertyConfigurator().doConfigure(p, isolatedHierarchy); IsolatedLog4JLogger.setHierarchy(isolatedHierarchy); + // TODO Findbugs log = LogFactory.getLog(this.getClass()); log.info("IsolatedLog4JLogger configured"); } Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/PortalContext.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/PortalContext.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/PortalContext.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -28,6 +28,7 @@ * @author David Sean Taylor * @version $Id: PortalContext.java 185962 2004-03-08 01:03:33Z jford $ */ +// TODO Findbugs public interface PortalContext extends javax.portlet.PortalContext { @@ -56,8 +57,8 @@ /** * Sets the application root path for this Jetspeed engine context. * - * @param applicationRoot - - * the applicationRoot path on the file system. + * @param applicationRoot + * - the applicationRoot path on the file system. */ public void setApplicationRoot(String applicationRoot); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/i18n/KeyedMessage.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/i18n/KeyedMessage.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/i18n/KeyedMessage.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -29,8 +29,8 @@ /** * KeyedMessage provides an automatically derived i18n message key based on its - * static instance definition and can be used as comparable constant too. - *

Purpose

+ * static instance definition and can be used as comparable constant too.

+ * Purpose

*

* With a KeyedMessage a named constant message (format) can be statically * defined which automatically translate themselves for a specific locale using @@ -44,34 +44,33 @@ *

*

* A KeyedMessage automatically derives the ResourceBundle lookup key from its - * (statically defined) instance field name using the following format:

+ * (statically defined) instance field name using the following format: + *

*   <containingClass.name>.<staticInstanceField.name> - * - *
+ *
*

*

* The containingClass is derived at construction time by analyzing the - * StackTraceElements of a thrown exception. This requires - * the instance to be defined as a public static field! + * StackTraceElements of a thrown exception. This requires the + * instance to be defined as a public static field! *

*

* At first access, the key is resolved by inspecting the derived * containingClass for the declared field defining this instance. *

*

- * If the KeyedMessage instance wasn't defined as public - * static field, the key can't be resolved and message translation using a - * ResourceBundle won't be possible. Translation using the default message will - * still work though. Furthermore, this instance can't be used as comparable - * named constant as the {@link #equals(Object)}method will always return false - * in this case. + * If the KeyedMessage instance wasn't defined as public static field, the + * key can't be resolved and message translation using a ResourceBundle won't be + * possible. Translation using the default message will still work though. + * Furthermore, this instance can't be used as comparable named constant as the + * {@link #equals(Object)}method will always return false in this case. *

*

Default ResourceBundle name derivation

*

* When the key of a KeyedMessage is resolved, the default ResourceBundle name * for message translation is retrieved from the defined public static String - * field named {@link #KEYED_MESSAGE_BUNDLE_FIELD_NAME "KEYED_MESSAGE_BUNDLE"}defined - * in its containingClass or one of its superClasses or interfaces. + * field named {@link #KEYED_MESSAGE_BUNDLE_FIELD_NAME "KEYED_MESSAGE_BUNDLE"} + * defined in its containingClass or one of its superClasses or interfaces. *

*

* If this field cannot be found, the fully qualified name of the @@ -94,7 +93,8 @@ * In Jetspeed, the LocalizationValve initializes the * {@link CurrentLocale} on each request. KeyedMessages accessed within the * context of an Jetspeed request therefore will always be translated using the - * current user Locale with the {@link #getMessage()}or {@link #toString()}methods. + * current user Locale with the {@link #getMessage()}or {@link #toString()} + * methods. *

*

Default ResourceBundle lookup

*

@@ -107,8 +107,8 @@ *

MessageFormat parameters

*

* MessageFormat patterns can also be used for a KeyedMessage.
With the - * {@link #create(Object[])}method a specialized copy of a KeyedMessage - * instance can be created containing the arguments to be used during message + * {@link #create(Object[])}method a specialized copy of a KeyedMessage instance + * can be created containing the arguments to be used during message * translation. *

*

@@ -116,10 +116,10 @@ * used for named constant comparison. *

*

- * For simplified usage, three {@link #create(Object)},{@link #create(Object, Object)}and - * {@link #create(Object, Object, Object)}methods are provided which delegate - * to {@link #create(Object[])}with their argument(s) transformed into an - * Object array. + * For simplified usage, three {@link #create(Object)}, + * {@link #create(Object, Object)}and {@link #create(Object, Object, Object)} + * methods are provided which delegate to {@link #create(Object[])}with their + * argument(s) transformed into an Object array. *

*

Extending KeyedMessage

*

@@ -183,7 +183,7 @@ * if ( SecurityException.USER_DOES_NOT_EXISTS.equals(sex.getKeyedMessage()) { * // handle USER_DOES_NOT_EXISTS error * } - * } + * } * * * @author Ate Douma @@ -195,7 +195,8 @@ /** * Static String Field name searched for in the class defining a * KeyedMessage containing the default resource bundle to use for - * translation.
Note: this Field is looked up using definingClass.getField thus it may also be + * translation.
+ * Note: this Field is looked up using definingClass.getField thus it may also be * defined in a superclass or interface of the definingClass. */ public static final String KEYED_MESSAGE_BUNDLE_FIELD_NAME = "KEYED_MESSAGE_BUNDLE"; @@ -350,6 +351,7 @@ resourceName = (String) field.get(null); } } + // TODO Findbugs catch (Exception e) { } @@ -579,7 +581,8 @@ } /** - * @return the arguments defined for this {@link #create(Object[]) derived}instance + * @return the arguments defined for this {@link #create(Object[]) derived} + * instance * @see #create(Object[]) */ public Object[] getArguments() @@ -590,7 +593,8 @@ /** * @param index * argument number - * @return an argument defined for this {@link #create(Object[]) derived}instance + * @return an argument defined for this {@link #create(Object[]) derived} + * instance */ public Object getArgument(int index) { @@ -610,14 +614,15 @@ /** * @param otherObject * KeyedMessage instance to compare with - * @return true only if otherObject is a KeyedMessage - * {@link create(Object[]) derived}from this instance (or visa - * versa) and (thus both are) {@link #resolve() resolved}. + * @return true only if otherObject is a KeyedMessage {@link + * create(Object[]) derived}from this instance (or visa versa) and + * (thus both are) {@link #resolve() resolved}. * @see #create(Object[]) * @see #resolve() */ public boolean equals(Object otherObject) { + // TODO Findbugs if (otherObject != null && otherObject instanceof KeyedMessage) { resolve(); Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/BaseSecurityReference.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/BaseSecurityReference.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/BaseSecurityReference.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -61,6 +61,7 @@ */ public Object clone() throws java.lang.CloneNotSupportedException { + // TODO Findbugs BaseSecurityReference cloned = new BaseSecurityReference(); cloned.parent = this.parent; Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/layout-portlets/src/java/org/apache/jetspeed/portlets/layout/LayoutPortlet.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -402,6 +402,7 @@ log.error("failed to remove portlet " + fragmentId + " from page: " + pageId, e); } + // TODO Findbugs removeFragment(page, page.getRootFragment(), fragmentId); } @@ -437,6 +438,7 @@ log.error("failed to add portlet " + portletId + " to page: " + pageId, e); } + // TODO Findbugs addPortletToPage(page, page.getRootFragment(), portletId); } @@ -718,8 +720,8 @@ * * @param name * Name of the Decoration. - * @return java.util.Properties representing the - * configuration object. + * @return java.util.Properties representing the configuration + * object. */ protected Configuration getConfiguration(RenderRequest request, String name) { @@ -864,6 +866,7 @@ private Configuration config; + // TODO Findbugs public CachedTemplate(String key, TemplateDescriptor template, Configuration config) { Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/taglibs/treecontrol/src/java/org/apache/webapp/admin/TreeControl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/taglibs/treecontrol/src/java/org/apache/webapp/admin/TreeControl.java 2008-07-09 10:14:13 UTC (rev 1020) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/taglibs/treecontrol/src/java/org/apache/webapp/admin/TreeControl.java 2008-07-09 10:15:05 UTC (rev 1021) @@ -23,13 +23,14 @@ /** *

* The overall data structure representing a tree control that can be - * rendered by the TreeControlTag custom tag. Each node of the - * tree is represented by an instance of TreeControlNode. + * rendered by the TreeControlTag custom tag. Each node of the tree + * is represented by an instance of TreeControlNode. *

* * @author Jazmin Jonson * @author Craig R. McClanahan - * @version $Revision: 516448 $ $Date: 2007-03-10 01:25:47 +0900 (ÅÚ, 10 3·î 2007) $ + * @version $Revision: 516448 $ $Date: 2007-03-10 01:25:47 +0900 (ÅÚ, 10 3·î 2007) + * $ */ public class TreeControl implements Serializable @@ -46,6 +47,7 @@ { super(); + // TODO Findbugs setRoot(null); } @@ -60,6 +62,7 @@ { super(); + // TODO Findbugs setRoot(root); } @@ -92,6 +95,7 @@ { if (this.root != null) removeNode(this.root); if (root != null) addNode(root); + // TODO Findbugs root.setLast(true); this.root = root; } @@ -134,8 +138,8 @@ * deselecting any previous node that was so marked. * * @param node - * Name of the node to mark as selected, or null - * if there should be no currently selected node + * Name of the node to mark as selected, or null if + * there should be no currently selected node */ public void selectNode(String name) { From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:26:12 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:26:12 +0900 Subject: [pal-cvs 3288] [1022] created trunk Message-ID: <1215667572.877565.15872.nullmailer@users.sourceforge.jp> Revision: 1022 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1022 Author: shinsuke Date: 2008-07-10 14:26:12 +0900 (Thu, 10 Jul 2008) Log Message: ----------- created trunk Added Paths: ----------- pal-portal/docs/ja/installation-guide/trunk/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:27:17 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:27:17 +0900 Subject: [pal-cvs 3289] [1023] moved to trunk. Message-ID: <1215667637.483257.16234.nullmailer@users.sourceforge.jp> Revision: 1023 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1023 Author: shinsuke Date: 2008-07-10 14:27:17 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/installation-guide/trunk/src/ Removed Paths: ------------- pal-portal/docs/ja/installation-guide/src/ -------------- next part -------------- Copied: pal-portal/docs/ja/installation-guide/trunk/src (from rev 1022, pal-portal/docs/ja/installation-guide/src) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:27:46 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:27:46 +0900 Subject: [pal-cvs 3290] [1024] moved to trunk. Message-ID: <1215667666.946627.16592.nullmailer@users.sourceforge.jp> Revision: 1024 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1024 Author: shinsuke Date: 2008-07-10 14:27:46 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/installation-guide/trunk/xdocs/ Removed Paths: ------------- pal-portal/docs/ja/installation-guide/xdocs/ -------------- next part -------------- Copied: pal-portal/docs/ja/installation-guide/trunk/xdocs (from rev 1023, pal-portal/docs/ja/installation-guide/xdocs) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:28:11 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:28:11 +0900 Subject: [pal-cvs 3291] [1025] moved to trunk. Message-ID: <1215667691.677218.17646.nullmailer@users.sourceforge.jp> Revision: 1025 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1025 Author: shinsuke Date: 2008-07-10 14:28:11 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/installation-guide/trunk/project.xml Removed Paths: ------------- pal-portal/docs/ja/installation-guide/project.xml -------------- next part -------------- Deleted: pal-portal/docs/ja/installation-guide/project.xml =================================================================== --- pal-portal/docs/ja/installation-guide/project.xml 2008-07-10 05:27:46 UTC (rev 1024) +++ pal-portal/docs/ja/installation-guide/project.xml 2008-07-10 05:28:11 UTC (rev 1025) @@ -1,36 +0,0 @@ - - - - PAL¥Ý¡¼¥¿¥ë ¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É - jp.sf.pal.pal-portal.docs.ja - installation-guide - 1.0 - - Portal Application Laboratory - http://sourceforge.jp/projects/pal/ - /images/pal-logo.png - - 2005 - - /images/sflogo.gif - - shell.sourceforge.jp - /home/groups/p/pa/pal/htdocs/pal-portal/docs/ja/installation-guide/ - - maven-license-plugin - - Copied: pal-portal/docs/ja/installation-guide/trunk/project.xml (from rev 1024, pal-portal/docs/ja/installation-guide/project.xml) =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/project.xml (rev 0) +++ pal-portal/docs/ja/installation-guide/trunk/project.xml 2008-07-10 05:28:11 UTC (rev 1025) @@ -0,0 +1,36 @@ + + + + PAL¥Ý¡¼¥¿¥ë ¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É + jp.sf.pal.pal-portal.docs.ja + installation-guide + 1.0 + + Portal Application Laboratory + http://sourceforge.jp/projects/pal/ + /images/pal-logo.png + + 2005 + + /images/sflogo.gif + + shell.sourceforge.jp + /home/groups/p/pa/pal/htdocs/pal-portal/docs/ja/installation-guide/ + + maven-license-plugin + + From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:28:19 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:28:19 +0900 Subject: [pal-cvs 3292] [1026] moved to trunk. Message-ID: <1215667699.446589.17733.nullmailer@users.sourceforge.jp> Revision: 1026 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1026 Author: shinsuke Date: 2008-07-10 14:28:19 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/installation-guide/trunk/project.properties Removed Paths: ------------- pal-portal/docs/ja/installation-guide/project.properties -------------- next part -------------- Deleted: pal-portal/docs/ja/installation-guide/project.properties =================================================================== --- pal-portal/docs/ja/installation-guide/project.properties 2008-07-10 05:28:11 UTC (rev 1025) +++ pal-portal/docs/ja/installation-guide/project.properties 2008-07-10 05:28:19 UTC (rev 1026) @@ -1,34 +0,0 @@ -# Repo -maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/,http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ - - -# -# DATE Preferences -# -# The place of the date on the pages : choices are 'bottom', 'left', 'right', 'navigation-top', 'navigation-bottom' -maven.xdoc.date = left -#maven.xdoc.date.format = yyyy/MM/dd HH:mm z -maven.xdoc.date.format = yyyy/MM/dd HH:mm -# The date locale -maven.xdoc.date.locale = ja - -# -# Doc Setting -# -maven.xdoc.version=${pom.currentVersion} -maven.xdoc.includeProjectDocumentation = no -maven.docs.outputencoding = EUC-JP -maven.javadoc.source = 1.4 -maven.xdoc.jsl=file:${maven.src.dir}/resources/site.jsl - -# Multiproject settings -maven.multiproject.includes=*/project.xml -maven.multiproject.excludes=project.xml -# following are default values but needed here because our allSite goal doesn't know them from the plugin -maven.multiproject.aggregateDir=multiproject/ -maven.multiproject.ignoreFailures=true - -maven.pdf.cover.type=Installation Guide -maven.pdf.companyLogo=http://pal.sourceforge.jp/images/pal_banner.gif -#maven.pdf.projectLogo=http://pal.sourceforge.jp/pal-portal/docs/ja/installation-guide/images/sflogo.gif -maven.pdf.projectLogo= Copied: pal-portal/docs/ja/installation-guide/trunk/project.properties (from rev 1025, pal-portal/docs/ja/installation-guide/project.properties) =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/project.properties (rev 0) +++ pal-portal/docs/ja/installation-guide/trunk/project.properties 2008-07-10 05:28:19 UTC (rev 1026) @@ -0,0 +1,34 @@ +# Repo +maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/,http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ + + +# +# DATE Preferences +# +# The place of the date on the pages : choices are 'bottom', 'left', 'right', 'navigation-top', 'navigation-bottom' +maven.xdoc.date = left +#maven.xdoc.date.format = yyyy/MM/dd HH:mm z +maven.xdoc.date.format = yyyy/MM/dd HH:mm +# The date locale +maven.xdoc.date.locale = ja + +# +# Doc Setting +# +maven.xdoc.version=${pom.currentVersion} +maven.xdoc.includeProjectDocumentation = no +maven.docs.outputencoding = EUC-JP +maven.javadoc.source = 1.4 +maven.xdoc.jsl=file:${maven.src.dir}/resources/site.jsl + +# Multiproject settings +maven.multiproject.includes=*/project.xml +maven.multiproject.excludes=project.xml +# following are default values but needed here because our allSite goal doesn't know them from the plugin +maven.multiproject.aggregateDir=multiproject/ +maven.multiproject.ignoreFailures=true + +maven.pdf.cover.type=Installation Guide +maven.pdf.companyLogo=http://pal.sourceforge.jp/images/pal_banner.gif +#maven.pdf.projectLogo=http://pal.sourceforge.jp/pal-portal/docs/ja/installation-guide/images/sflogo.gif +maven.pdf.projectLogo= From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:30:34 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:30:34 +0900 Subject: [pal-cvs 3293] [1027] created trunk. Message-ID: <1215667834.581541.19436.nullmailer@users.sourceforge.jp> Revision: 1027 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1027 Author: shinsuke Date: 2008-07-10 14:30:34 +0900 (Thu, 10 Jul 2008) Log Message: ----------- created trunk. Added Paths: ----------- pal-portal/docs/ja/administration-guide/trunk/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:30:50 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:30:50 +0900 Subject: [pal-cvs 3294] [1028] created trunk. Message-ID: <1215667850.992548.19521.nullmailer@users.sourceforge.jp> Revision: 1028 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1028 Author: shinsuke Date: 2008-07-10 14:30:50 +0900 (Thu, 10 Jul 2008) Log Message: ----------- created trunk. Added Paths: ----------- pal-portal/docs/ja/configuration-guide/trunk/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:31:09 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:31:09 +0900 Subject: [pal-cvs 3295] [1029] created trunk. Message-ID: <1215667869.223629.19624.nullmailer@users.sourceforge.jp> Revision: 1029 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1029 Author: shinsuke Date: 2008-07-10 14:31:09 +0900 (Thu, 10 Jul 2008) Log Message: ----------- created trunk. Added Paths: ----------- pal-portal/docs/ja/portlet-developers-guide/trunk/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:33:06 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:33:06 +0900 Subject: [pal-cvs 3296] [1030] moved to trunk. Message-ID: <1215667986.596829.21067.nullmailer@users.sourceforge.jp> Revision: 1030 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1030 Author: shinsuke Date: 2008-07-10 14:33:06 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/portlet-developers-guide/trunk/src/ Removed Paths: ------------- pal-portal/docs/ja/portlet-developers-guide/src/ -------------- next part -------------- Copied: pal-portal/docs/ja/portlet-developers-guide/trunk/src (from rev 1029, pal-portal/docs/ja/portlet-developers-guide/src) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:33:07 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:33:07 +0900 Subject: [pal-cvs 3297] [1031] moved to trunk. Message-ID: <1215667987.401241.21112.nullmailer@users.sourceforge.jp> Revision: 1031 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1031 Author: shinsuke Date: 2008-07-10 14:33:07 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/portlet-developers-guide/trunk/xdocs/ Removed Paths: ------------- pal-portal/docs/ja/portlet-developers-guide/xdocs/ -------------- next part -------------- Copied: pal-portal/docs/ja/portlet-developers-guide/trunk/xdocs (from rev 1030, pal-portal/docs/ja/portlet-developers-guide/xdocs) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:33:08 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:33:08 +0900 Subject: [pal-cvs 3298] [1032] moved to trunk. Message-ID: <1215667988.205296.21157.nullmailer@users.sourceforge.jp> Revision: 1032 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1032 Author: shinsuke Date: 2008-07-10 14:33:08 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/portlet-developers-guide/trunk/project.xml Removed Paths: ------------- pal-portal/docs/ja/portlet-developers-guide/project.xml -------------- next part -------------- Deleted: pal-portal/docs/ja/portlet-developers-guide/project.xml =================================================================== --- pal-portal/docs/ja/portlet-developers-guide/project.xml 2008-07-10 05:33:07 UTC (rev 1031) +++ pal-portal/docs/ja/portlet-developers-guide/project.xml 2008-07-10 05:33:08 UTC (rev 1032) @@ -1,36 +0,0 @@ - - - - PAL¥Ý¡¼¥¿¥ë ¥Ý¡¼¥È¥ì¥Ã¥È³«È¯¼Ô¥¬¥¤¥É - jp.sf.pal.pal-portal.docs.ja - portlet-developers-guide - 0.1-SNAPSHOT - - Portal Application Laboratory - http://sourceforge.jp/projects/pal/ - /images/pal-logo.png - - 2005 - - http://pal.sourceforge.jp/images/sflogo.png - - shell.sourceforge.jp - /home/groups/p/pa/pal/htdocs/pal-portal/docs/ja/portlet-developers-guide/ - - maven-license-plugin - - Copied: pal-portal/docs/ja/portlet-developers-guide/trunk/project.xml (from rev 1031, pal-portal/docs/ja/portlet-developers-guide/project.xml) =================================================================== --- pal-portal/docs/ja/portlet-developers-guide/trunk/project.xml (rev 0) +++ pal-portal/docs/ja/portlet-developers-guide/trunk/project.xml 2008-07-10 05:33:08 UTC (rev 1032) @@ -0,0 +1,36 @@ + + + + PAL¥Ý¡¼¥¿¥ë ¥Ý¡¼¥È¥ì¥Ã¥È³«È¯¼Ô¥¬¥¤¥É + jp.sf.pal.pal-portal.docs.ja + portlet-developers-guide + 0.1-SNAPSHOT + + Portal Application Laboratory + http://sourceforge.jp/projects/pal/ + /images/pal-logo.png + + 2005 + + http://pal.sourceforge.jp/images/sflogo.png + + shell.sourceforge.jp + /home/groups/p/pa/pal/htdocs/pal-portal/docs/ja/portlet-developers-guide/ + + maven-license-plugin + + From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:33:09 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:33:09 +0900 Subject: [pal-cvs 3299] [1033] moved to trunk. Message-ID: <1215667989.018176.21200.nullmailer@users.sourceforge.jp> Revision: 1033 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1033 Author: shinsuke Date: 2008-07-10 14:33:08 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/portlet-developers-guide/trunk/project.properties Removed Paths: ------------- pal-portal/docs/ja/portlet-developers-guide/project.properties -------------- next part -------------- Deleted: pal-portal/docs/ja/portlet-developers-guide/project.properties =================================================================== --- pal-portal/docs/ja/portlet-developers-guide/project.properties 2008-07-10 05:33:08 UTC (rev 1032) +++ pal-portal/docs/ja/portlet-developers-guide/project.properties 2008-07-10 05:33:08 UTC (rev 1033) @@ -1,33 +0,0 @@ -# Repo -maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/,http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ - -# -# DATE Preferences -# -# The place of the date on the pages : choices are 'bottom', 'left', 'right', 'navigation-top', 'navigation-bottom' -maven.xdoc.date = left -#maven.xdoc.date.format = yyyy/MM/dd HH:mm z -maven.xdoc.date.format = yyyy/MM/dd HH:mm -# The date locale -maven.xdoc.date.locale = ja - -# -# Doc Setting -# -maven.xdoc.version=${pom.currentVersion} -maven.xdoc.includeProjectDocumentation = no -maven.docs.outputencoding = EUC-JP -maven.javadoc.source = 1.4 -maven.xdoc.jsl=file:${maven.src.dir}/resources/site.jsl - -# Multiproject settings -maven.multiproject.includes=*/project.xml -maven.multiproject.excludes=project.xml -# following are default values but needed here because our allSite goal doesn't know them from the plugin -maven.multiproject.aggregateDir=multiproject/ -maven.multiproject.ignoreFailures=true - -maven.pdf.cover.type=Portlet Developer's Guide -maven.pdf.companyLogo=http://pal.sourceforge.jp/images/pal_banner.gif -#maven.pdf.projectLogo=http://pal.sourceforge.jp/pal-portal/docs/ja/portlet-developers-guide/images/sflogo.gif -maven.pdf.projectLogo= Copied: pal-portal/docs/ja/portlet-developers-guide/trunk/project.properties (from rev 1032, pal-portal/docs/ja/portlet-developers-guide/project.properties) =================================================================== --- pal-portal/docs/ja/portlet-developers-guide/trunk/project.properties (rev 0) +++ pal-portal/docs/ja/portlet-developers-guide/trunk/project.properties 2008-07-10 05:33:08 UTC (rev 1033) @@ -0,0 +1,33 @@ +# Repo +maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/,http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ + +# +# DATE Preferences +# +# The place of the date on the pages : choices are 'bottom', 'left', 'right', 'navigation-top', 'navigation-bottom' +maven.xdoc.date = left +#maven.xdoc.date.format = yyyy/MM/dd HH:mm z +maven.xdoc.date.format = yyyy/MM/dd HH:mm +# The date locale +maven.xdoc.date.locale = ja + +# +# Doc Setting +# +maven.xdoc.version=${pom.currentVersion} +maven.xdoc.includeProjectDocumentation = no +maven.docs.outputencoding = EUC-JP +maven.javadoc.source = 1.4 +maven.xdoc.jsl=file:${maven.src.dir}/resources/site.jsl + +# Multiproject settings +maven.multiproject.includes=*/project.xml +maven.multiproject.excludes=project.xml +# following are default values but needed here because our allSite goal doesn't know them from the plugin +maven.multiproject.aggregateDir=multiproject/ +maven.multiproject.ignoreFailures=true + +maven.pdf.cover.type=Portlet Developer's Guide +maven.pdf.companyLogo=http://pal.sourceforge.jp/images/pal_banner.gif +#maven.pdf.projectLogo=http://pal.sourceforge.jp/pal-portal/docs/ja/portlet-developers-guide/images/sflogo.gif +maven.pdf.projectLogo= From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:33:45 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:33:45 +0900 Subject: [pal-cvs 3300] [1034] moved to trunk. Message-ID: <1215668025.544471.21438.nullmailer@users.sourceforge.jp> Revision: 1034 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1034 Author: shinsuke Date: 2008-07-10 14:33:45 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/administration-guide/trunk/src/ Removed Paths: ------------- pal-portal/docs/ja/administration-guide/src/ -------------- next part -------------- Copied: pal-portal/docs/ja/administration-guide/trunk/src (from rev 1033, pal-portal/docs/ja/administration-guide/src) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:33:46 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:33:46 +0900 Subject: [pal-cvs 3301] [1035] moved to trunk. Message-ID: <1215668026.376888.21482.nullmailer@users.sourceforge.jp> Revision: 1035 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1035 Author: shinsuke Date: 2008-07-10 14:33:46 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/administration-guide/trunk/xdocs/ Removed Paths: ------------- pal-portal/docs/ja/administration-guide/xdocs/ -------------- next part -------------- Copied: pal-portal/docs/ja/administration-guide/trunk/xdocs (from rev 1034, pal-portal/docs/ja/administration-guide/xdocs) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:33:47 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:33:47 +0900 Subject: [pal-cvs 3302] [1036] moved to trunk. Message-ID: <1215668027.224810.21524.nullmailer@users.sourceforge.jp> Revision: 1036 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1036 Author: shinsuke Date: 2008-07-10 14:33:47 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/administration-guide/trunk/project.xml Removed Paths: ------------- pal-portal/docs/ja/administration-guide/project.xml -------------- next part -------------- Deleted: pal-portal/docs/ja/administration-guide/project.xml =================================================================== --- pal-portal/docs/ja/administration-guide/project.xml 2008-07-10 05:33:46 UTC (rev 1035) +++ pal-portal/docs/ja/administration-guide/project.xml 2008-07-10 05:33:47 UTC (rev 1036) @@ -1,36 +0,0 @@ - - - - PAL¥Ý¡¼¥¿¥ë ´ÉÍý¥¬¥¤¥É - jp.sf.pal.pal-portal.docs.ja - administration-guide - 1.0 - - Portal Application Laboratory - http://sourceforge.jp/projects/pal/ - /images/pal-logo.png - - 2005 - - /images/sflogo.gif - - shell.sourceforge.jp - /home/groups/p/pa/pal/htdocs/pal-portal/docs/ja/administration-guide/ - - maven-license-plugin - - Copied: pal-portal/docs/ja/administration-guide/trunk/project.xml (from rev 1035, pal-portal/docs/ja/administration-guide/project.xml) =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/project.xml (rev 0) +++ pal-portal/docs/ja/administration-guide/trunk/project.xml 2008-07-10 05:33:47 UTC (rev 1036) @@ -0,0 +1,36 @@ + + + + PAL¥Ý¡¼¥¿¥ë ´ÉÍý¥¬¥¤¥É + jp.sf.pal.pal-portal.docs.ja + administration-guide + 1.0 + + Portal Application Laboratory + http://sourceforge.jp/projects/pal/ + /images/pal-logo.png + + 2005 + + /images/sflogo.gif + + shell.sourceforge.jp + /home/groups/p/pa/pal/htdocs/pal-portal/docs/ja/administration-guide/ + + maven-license-plugin + + From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:33:48 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:33:48 +0900 Subject: [pal-cvs 3303] [1037] moved to trunk. Message-ID: <1215668028.073696.21566.nullmailer@users.sourceforge.jp> Revision: 1037 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1037 Author: shinsuke Date: 2008-07-10 14:33:47 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/administration-guide/trunk/project.properties Removed Paths: ------------- pal-portal/docs/ja/administration-guide/project.properties -------------- next part -------------- Deleted: pal-portal/docs/ja/administration-guide/project.properties =================================================================== --- pal-portal/docs/ja/administration-guide/project.properties 2008-07-10 05:33:47 UTC (rev 1036) +++ pal-portal/docs/ja/administration-guide/project.properties 2008-07-10 05:33:47 UTC (rev 1037) @@ -1,33 +0,0 @@ -# Repo -maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/,http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ - -# -# DATE Preferences -# -# The place of the date on the pages : choices are 'bottom', 'left', 'right', 'navigation-top', 'navigation-bottom' -maven.xdoc.date = left -#maven.xdoc.date.format = yyyy/MM/dd HH:mm z -maven.xdoc.date.format = yyyy/MM/dd HH:mm -# The date locale -maven.xdoc.date.locale = ja - -# -# Doc Setting -# -maven.xdoc.version=${pom.currentVersion} -maven.xdoc.includeProjectDocumentation = no -maven.docs.outputencoding = EUC-JP -maven.javadoc.source = 1.4 -maven.xdoc.jsl=file:${maven.src.dir}/resources/site.jsl - -# Multiproject settings -maven.multiproject.includes=*/project.xml -maven.multiproject.excludes=project.xml -# following are default values but needed here because our allSite goal doesn't know them from the plugin -maven.multiproject.aggregateDir=multiproject/ -maven.multiproject.ignoreFailures=true - -maven.pdf.cover.type=Administration Guide -maven.pdf.companyLogo=http://pal.sourceforge.jp/images/pal_banner.gif -#maven.pdf.projectLogo=http://pal.sourceforge.jp/pal-portal/docs/ja/administration-guide/images/sflogo.gif -maven.pdf.projectLogo= Copied: pal-portal/docs/ja/administration-guide/trunk/project.properties (from rev 1036, pal-portal/docs/ja/administration-guide/project.properties) =================================================================== --- pal-portal/docs/ja/administration-guide/trunk/project.properties (rev 0) +++ pal-portal/docs/ja/administration-guide/trunk/project.properties 2008-07-10 05:33:47 UTC (rev 1037) @@ -0,0 +1,33 @@ +# Repo +maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/,http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ + +# +# DATE Preferences +# +# The place of the date on the pages : choices are 'bottom', 'left', 'right', 'navigation-top', 'navigation-bottom' +maven.xdoc.date = left +#maven.xdoc.date.format = yyyy/MM/dd HH:mm z +maven.xdoc.date.format = yyyy/MM/dd HH:mm +# The date locale +maven.xdoc.date.locale = ja + +# +# Doc Setting +# +maven.xdoc.version=${pom.currentVersion} +maven.xdoc.includeProjectDocumentation = no +maven.docs.outputencoding = EUC-JP +maven.javadoc.source = 1.4 +maven.xdoc.jsl=file:${maven.src.dir}/resources/site.jsl + +# Multiproject settings +maven.multiproject.includes=*/project.xml +maven.multiproject.excludes=project.xml +# following are default values but needed here because our allSite goal doesn't know them from the plugin +maven.multiproject.aggregateDir=multiproject/ +maven.multiproject.ignoreFailures=true + +maven.pdf.cover.type=Administration Guide +maven.pdf.companyLogo=http://pal.sourceforge.jp/images/pal_banner.gif +#maven.pdf.projectLogo=http://pal.sourceforge.jp/pal-portal/docs/ja/administration-guide/images/sflogo.gif +maven.pdf.projectLogo= From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:34:18 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:34:18 +0900 Subject: [pal-cvs 3304] [1038] moved to trunk. Message-ID: <1215668058.415075.22584.nullmailer@users.sourceforge.jp> Revision: 1038 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1038 Author: shinsuke Date: 2008-07-10 14:34:18 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/configuration-guide/trunk/src/ Removed Paths: ------------- pal-portal/docs/ja/configuration-guide/src/ -------------- next part -------------- Copied: pal-portal/docs/ja/configuration-guide/trunk/src (from rev 1037, pal-portal/docs/ja/configuration-guide/src) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:34:19 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:34:19 +0900 Subject: [pal-cvs 3305] [1039] moved to trunk. Message-ID: <1215668059.270186.22627.nullmailer@users.sourceforge.jp> Revision: 1039 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1039 Author: shinsuke Date: 2008-07-10 14:34:19 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/configuration-guide/trunk/xdocs/ Removed Paths: ------------- pal-portal/docs/ja/configuration-guide/xdocs/ -------------- next part -------------- Copied: pal-portal/docs/ja/configuration-guide/trunk/xdocs (from rev 1038, pal-portal/docs/ja/configuration-guide/xdocs) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:34:20 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:34:20 +0900 Subject: [pal-cvs 3306] [1040] moved to trunk. Message-ID: <1215668060.091413.22671.nullmailer@users.sourceforge.jp> Revision: 1040 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1040 Author: shinsuke Date: 2008-07-10 14:34:20 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/configuration-guide/trunk/project.xml Removed Paths: ------------- pal-portal/docs/ja/configuration-guide/project.xml -------------- next part -------------- Deleted: pal-portal/docs/ja/configuration-guide/project.xml =================================================================== --- pal-portal/docs/ja/configuration-guide/project.xml 2008-07-10 05:34:19 UTC (rev 1039) +++ pal-portal/docs/ja/configuration-guide/project.xml 2008-07-10 05:34:20 UTC (rev 1040) @@ -1,36 +0,0 @@ - - - - PAL¥Ý¡¼¥¿¥ë ÀßÄꥬ¥¤¥É - jp.sf.pal.pal-portal.docs.ja - configuration-guide - 0.1-SNAPSHOT - - Portal Application Laboratory - http://sourceforge.jp/projects/pal/ - /images/pal-logo.png - - 2005 - - /images/sflogo.gif - - shell.sourceforge.jp - /home/groups/p/pa/pal/htdocs/pal-portal/docs/ja/configuration-guide/ - - maven-license-plugin - - Copied: pal-portal/docs/ja/configuration-guide/trunk/project.xml (from rev 1039, pal-portal/docs/ja/configuration-guide/project.xml) =================================================================== --- pal-portal/docs/ja/configuration-guide/trunk/project.xml (rev 0) +++ pal-portal/docs/ja/configuration-guide/trunk/project.xml 2008-07-10 05:34:20 UTC (rev 1040) @@ -0,0 +1,36 @@ + + + + PAL¥Ý¡¼¥¿¥ë ÀßÄꥬ¥¤¥É + jp.sf.pal.pal-portal.docs.ja + configuration-guide + 0.1-SNAPSHOT + + Portal Application Laboratory + http://sourceforge.jp/projects/pal/ + /images/pal-logo.png + + 2005 + + /images/sflogo.gif + + shell.sourceforge.jp + /home/groups/p/pa/pal/htdocs/pal-portal/docs/ja/configuration-guide/ + + maven-license-plugin + + From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:34:20 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:34:20 +0900 Subject: [pal-cvs 3307] [1041] moved to trunk. Message-ID: <1215668060.933915.22725.nullmailer@users.sourceforge.jp> Revision: 1041 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1041 Author: shinsuke Date: 2008-07-10 14:34:20 +0900 (Thu, 10 Jul 2008) Log Message: ----------- moved to trunk. Added Paths: ----------- pal-portal/docs/ja/configuration-guide/trunk/project.properties Removed Paths: ------------- pal-portal/docs/ja/configuration-guide/project.properties -------------- next part -------------- Deleted: pal-portal/docs/ja/configuration-guide/project.properties =================================================================== --- pal-portal/docs/ja/configuration-guide/project.properties 2008-07-10 05:34:20 UTC (rev 1040) +++ pal-portal/docs/ja/configuration-guide/project.properties 2008-07-10 05:34:20 UTC (rev 1041) @@ -1,33 +0,0 @@ -# Repo -maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/,http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ - -# -# DATE Preferences -# -# The place of the date on the pages : choices are 'bottom', 'left', 'right', 'navigation-top', 'navigation-bottom' -maven.xdoc.date = left -#maven.xdoc.date.format = yyyy/MM/dd HH:mm z -maven.xdoc.date.format = yyyy/MM/dd HH:mm -# The date locale -maven.xdoc.date.locale = ja - -# -# Doc Setting -# -maven.xdoc.version=${pom.currentVersion} -maven.xdoc.includeProjectDocumentation = no -maven.docs.outputencoding = EUC-JP -maven.javadoc.source = 1.4 -maven.xdoc.jsl=file:${maven.src.dir}/resources/site.jsl - -# Multiproject settings -maven.multiproject.includes=*/project.xml -maven.multiproject.excludes=project.xml -# following are default values but needed here because our allSite goal doesn't know them from the plugin -maven.multiproject.aggregateDir=multiproject/ -maven.multiproject.ignoreFailures=true - -maven.pdf.cover.type=Configuration Guide -maven.pdf.companyLogo=http://pal.sourceforge.jp/images/pal_banner.gif -#maven.pdf.projectLogo=http://pal.sourceforge.jp/pal-portal/docs/ja/configuration-guide/images/sflogo.gif -maven.pdf.projectLogo= Copied: pal-portal/docs/ja/configuration-guide/trunk/project.properties (from rev 1040, pal-portal/docs/ja/configuration-guide/project.properties) =================================================================== --- pal-portal/docs/ja/configuration-guide/trunk/project.properties (rev 0) +++ pal-portal/docs/ja/configuration-guide/trunk/project.properties 2008-07-10 05:34:20 UTC (rev 1041) @@ -0,0 +1,33 @@ +# Repo +maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/,http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ + +# +# DATE Preferences +# +# The place of the date on the pages : choices are 'bottom', 'left', 'right', 'navigation-top', 'navigation-bottom' +maven.xdoc.date = left +#maven.xdoc.date.format = yyyy/MM/dd HH:mm z +maven.xdoc.date.format = yyyy/MM/dd HH:mm +# The date locale +maven.xdoc.date.locale = ja + +# +# Doc Setting +# +maven.xdoc.version=${pom.currentVersion} +maven.xdoc.includeProjectDocumentation = no +maven.docs.outputencoding = EUC-JP +maven.javadoc.source = 1.4 +maven.xdoc.jsl=file:${maven.src.dir}/resources/site.jsl + +# Multiproject settings +maven.multiproject.includes=*/project.xml +maven.multiproject.excludes=project.xml +# following are default values but needed here because our allSite goal doesn't know them from the plugin +maven.multiproject.aggregateDir=multiproject/ +maven.multiproject.ignoreFailures=true + +maven.pdf.cover.type=Configuration Guide +maven.pdf.companyLogo=http://pal.sourceforge.jp/images/pal_banner.gif +#maven.pdf.projectLogo=http://pal.sourceforge.jp/pal-portal/docs/ja/configuration-guide/images/sflogo.gif +maven.pdf.projectLogo= From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:50:22 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:50:22 +0900 Subject: [pal-cvs 3308] [1042] created tags. Message-ID: <1215669022.875527.1363.nullmailer@users.sourceforge.jp> Revision: 1042 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1042 Author: shinsuke Date: 2008-07-10 14:50:22 +0900 (Thu, 10 Jul 2008) Log Message: ----------- created tags. Added Paths: ----------- pal-portal/docs/ja/portlet-developers-guide/tags/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:50:38 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:50:38 +0900 Subject: [pal-cvs 3309] [1043] created tags. Message-ID: <1215669038.934979.1430.nullmailer@users.sourceforge.jp> Revision: 1043 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1043 Author: shinsuke Date: 2008-07-10 14:50:38 +0900 (Thu, 10 Jul 2008) Log Message: ----------- created tags. Added Paths: ----------- pal-portal/docs/ja/installation-guide/tags/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:50:49 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:50:49 +0900 Subject: [pal-cvs 3310] [1044] created tags. Message-ID: <1215669049.608064.1653.nullmailer@users.sourceforge.jp> Revision: 1044 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1044 Author: shinsuke Date: 2008-07-10 14:50:49 +0900 (Thu, 10 Jul 2008) Log Message: ----------- created tags. Added Paths: ----------- pal-portal/docs/ja/administration-guide/tags/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:51:03 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:51:03 +0900 Subject: [pal-cvs 3311] [1045] created tags. Message-ID: <1215669063.109344.1719.nullmailer@users.sourceforge.jp> Revision: 1045 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1045 Author: shinsuke Date: 2008-07-10 14:51:03 +0900 (Thu, 10 Jul 2008) Log Message: ----------- created tags. Added Paths: ----------- pal-portal/docs/ja/configuration-guide/tags/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:52:20 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:52:20 +0900 Subject: [pal-cvs 3312] [1046] Findbugs Message-ID: <1215669140.622513.2936.nullmailer@users.sourceforge.jp> Revision: 1046 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1046 Author: sone Date: 2008-07-10 14:52:20 +0900 (Thu, 10 Jul 2008) Log Message: ----------- Findbugs Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MultipleAction.java pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MultipleAction.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MultipleAction.java 2008-07-10 05:51:03 UTC (rev 1045) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/jetspeed/layout/impl/MultipleAction.java 2008-07-10 05:52:20 UTC (rev 1046) @@ -45,17 +45,21 @@ * * @author David Gurney * - * The purpose of this object is to run several AJAX actions and aggregate the - * results into a single response. This is useful when the client needs to make - * more than one call as the result of a single user action. + * The purpose of this object is to run several AJAX actions and + * aggregate the results into a single response. This is useful when the + * client needs to make more than one call as the result of a single + * user action. * - * The sample request URL is shown below: + * The sample request URL is shown below: * - * http://host:port/ajaxapi?action=multiple&commands=(action;name,value;name,value)(action;name,value) + * + * http://host:port/ajaxapi?action=multiple&commands=(action;name,value;name + * ,value)(action;name,value) * - * The constructor accepts a map of the actions that are available to be run. - * The name,value pairs are parameter values needed by the action. The actions - * are run in the order that they are found on the URL string + * The constructor accepts a map of the actions that are available to be + * run. The name,value pairs are parameter values needed by the action. + * The actions are run in the order that they are found on the URL + * string * */ public class MultipleAction extends BasePortletAction implements AjaxAction, @@ -150,8 +154,9 @@ // Lookup the action from the action map Object a_oActionObject = actionMap.get(a_sAction); - if (a_oActionObject == null - && !(a_oActionObject instanceof AjaxAction)) + if (a_oActionObject == null) + // DONE Findbugs + // && !(a_oActionObject instanceof AjaxAction)) { buildErrorContext(p_oRequestContext, p_oResultMap); p_oResultMap.put(REASON, "unknown action requested==>" Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java 2008-07-10 05:51:03 UTC (rev 1045) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/SchemaAwareDataSourceProxy.java 2008-07-10 05:52:20 UTC (rev 1046) @@ -32,7 +32,8 @@ * schema switching was stripped. * * @author Joachim M«äller - * @version $Id: SchemaAwareDataSourceProxy.java 601297 2007-12-05 11:20:04Z ate $ + * @version $Id: SchemaAwareDataSourceProxy.java 601297 2007-12-05 11:20:04Z ate + * $ */ public class SchemaAwareDataSourceProxy extends TransactionAwareDataSourceProxy { @@ -63,6 +64,7 @@ try { // database specific SQL. + // TODO Findbugs stmt.execute(schemaSql); } catch (Exception e) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:53:38 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:53:38 +0900 Subject: [pal-cvs 3313] [1047] version 1.0. Message-ID: <1215669218.890219.3364.nullmailer@users.sourceforge.jp> Revision: 1047 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1047 Author: shinsuke Date: 2008-07-10 14:53:38 +0900 (Thu, 10 Jul 2008) Log Message: ----------- version 1.0. Added Paths: ----------- pal-portal/docs/ja/administration-guide/tags/administration-guide-1.0/ Removed Paths: ------------- pal-portal/docs/ja/administration-guide/trunk/ -------------- next part -------------- Copied: pal-portal/docs/ja/administration-guide/tags/administration-guide-1.0 (from rev 1046, pal-portal/docs/ja/administration-guide/trunk) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 14:54:03 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 14:54:03 +0900 Subject: [pal-cvs 3314] [1048] version 1.0. Message-ID: <1215669243.981257.4331.nullmailer@users.sourceforge.jp> Revision: 1048 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1048 Author: shinsuke Date: 2008-07-10 14:54:03 +0900 (Thu, 10 Jul 2008) Log Message: ----------- version 1.0. Added Paths: ----------- pal-portal/docs/ja/installation-guide/tags/installation-guide-1.0/ Removed Paths: ------------- pal-portal/docs/ja/installation-guide/trunk/ -------------- next part -------------- Copied: pal-portal/docs/ja/installation-guide/tags/installation-guide-1.0 (from rev 1047, pal-portal/docs/ja/installation-guide/trunk) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 15:40:18 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 15:40:18 +0900 Subject: [pal-cvs 3315] [1049] backout.. Message-ID: <1215672018.420475.10857.nullmailer@users.sourceforge.jp> Revision: 1049 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1049 Author: shinsuke Date: 2008-07-10 15:40:18 +0900 (Thu, 10 Jul 2008) Log Message: ----------- backout.. Added Paths: ----------- pal-portal/docs/ja/installation-guide/trunk/ -------------- next part -------------- Copied: pal-portal/docs/ja/installation-guide/trunk (from rev 1048, pal-portal/docs/ja/installation-guide/tags/installation-guide-1.0) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 15:40:45 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 15:40:45 +0900 Subject: [pal-cvs 3316] [1050] version 1.0. Message-ID: <1215672045.416249.10976.nullmailer@users.sourceforge.jp> Revision: 1050 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1050 Author: shinsuke Date: 2008-07-10 15:40:45 +0900 (Thu, 10 Jul 2008) Log Message: ----------- version 1.0. Added Paths: ----------- pal-portal/docs/ja/administration-guide/trunk/ Removed Paths: ------------- pal-portal/docs/ja/administration-guide/tags/administration-guide-1.0/ -------------- next part -------------- Copied: pal-portal/docs/ja/administration-guide/trunk (from rev 1049, pal-portal/docs/ja/administration-guide/tags/administration-guide-1.0) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 15:41:32 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 15:41:32 +0900 Subject: [pal-cvs 3317] [1051] oops.. Message-ID: <1215672092.074868.11145.nullmailer@users.sourceforge.jp> Revision: 1051 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1051 Author: shinsuke Date: 2008-07-10 15:41:31 +0900 (Thu, 10 Jul 2008) Log Message: ----------- oops.. copy version 1.0 again.. Added Paths: ----------- pal-portal/docs/ja/administration-guide/tags/administration-guide-1.0/ -------------- next part -------------- Copied: pal-portal/docs/ja/administration-guide/tags/administration-guide-1.0 (from rev 1050, pal-portal/docs/ja/administration-guide/trunk) From svnnotify ¡÷ sourceforge.jp Thu Jul 10 15:46:50 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 15:46:50 +0900 Subject: [pal-cvs 3318] [1052] 1.0.1-SNAPSHOT Message-ID: <1215672410.601923.15421.nullmailer@users.sourceforge.jp> Revision: 1052 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1052 Author: shinsuke Date: 2008-07-10 15:46:50 +0900 (Thu, 10 Jul 2008) Log Message: ----------- 1.0.1-SNAPSHOT Modified Paths: -------------- pal-portal/docs/ja/installation-guide/trunk/project.xml -------------- next part -------------- Modified: pal-portal/docs/ja/installation-guide/trunk/project.xml =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/project.xml 2008-07-10 06:41:31 UTC (rev 1051) +++ pal-portal/docs/ja/installation-guide/trunk/project.xml 2008-07-10 06:46:50 UTC (rev 1052) @@ -18,7 +18,7 @@ PAL¥Ý¡¼¥¿¥ë ¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É jp.sf.pal.pal-portal.docs.ja installation-guide - 1.0 + 1.0.1-SNAPSHOT Portal Application Laboratory http://sourceforge.jp/projects/pal/ From svnnotify ¡÷ sourceforge.jp Thu Jul 10 15:47:04 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 15:47:04 +0900 Subject: [pal-cvs 3319] [1053] added mysql info Message-ID: <1215672424.808994.15547.nullmailer@users.sourceforge.jp> Revision: 1053 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1053 Author: shinsuke Date: 2008-07-10 15:47:04 +0900 (Thu, 10 Jul 2008) Log Message: ----------- added mysql info Modified Paths: -------------- pal-portal/docs/ja/installation-guide/trunk/xdocs/navigation.xml Added Paths: ----------- pal-portal/docs/ja/installation-guide/trunk/xdocs/guide-db-mysql.xml -------------- next part -------------- Added: pal-portal/docs/ja/installation-guide/trunk/xdocs/guide-db-mysql.xml =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/xdocs/guide-db-mysql.xml (rev 0) +++ pal-portal/docs/ja/installation-guide/trunk/xdocs/guide-db-mysql.xml 2008-07-10 06:47:04 UTC (rev 1053) @@ -0,0 +1,59 @@ + + + + + PAL¥Ý¡¼¥¿¥ë ¥¤¥ó¥¹¥È¡¼¥ë¥¬¥¤¥É + ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÀßÄê¤Ë¤Ä¤¤¤Æ MySQL + + + + + +
+

+ MySQL ¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹¤È¤·¤ÆÍøÍѤ¹¤ë¾ì¹ç¡¢MySQL ¤ÎÀßÄê¥Õ¥¡¥¤¥ë /etc/my.conf ¤Ëʸ»ú½¸¹ç¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ + ÀßÄêÆâÍƤϰʲ¼¤Î¤è¤¦¤Ë default-character-set ¤Ç»ØÄꤷ¤Þ¤¹¡£ +

+ +
+ + Property changes on: pal-portal/docs/ja/installation-guide/trunk/xdocs/guide-db-mysql.xml ___________________________________________________________________ Name: svn:eol-style + native Modified: pal-portal/docs/ja/installation-guide/trunk/xdocs/navigation.xml =================================================================== --- pal-portal/docs/ja/installation-guide/trunk/xdocs/navigation.xml 2008-07-10 06:46:50 UTC (rev 1052) +++ pal-portal/docs/ja/installation-guide/trunk/xdocs/navigation.xml 2008-07-10 06:47:04 UTC (rev 1053) @@ -38,5 +38,8 @@ + + + From svnnotify ¡÷ sourceforge.jp Thu Jul 10 22:46:56 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 10 Jul 2008 22:46:56 +0900 Subject: [pal-cvs 3320] [1054] default profiling rule supports multiple groups and roles. Message-ID: <1215697616.312073.31058.nullmailer@users.sourceforge.jp> Revision: 1054 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1054 Author: shinsuke Date: 2008-07-10 22:46:55 +0900 (Thu, 10 Jul 2008) Log Message: ----------- default profiling rule supports multiple groups and roles. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-07-10 06:47:04 UTC (rev 1053) +++ pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-07-10 13:46:55 UTC (rev 1054) @@ -388,7 +388,7 @@ - + @@ -419,7 +419,7 @@ - + @@ -502,7 +502,7 @@ - + From svnnotify ¡÷ sourceforge.jp Mon Jul 14 06:47:50 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 14 Jul 2008 06:47:50 +0900 Subject: [pal-cvs 3321] [1055] clean up. Message-ID: <1215985670.901282.28296.nullmailer@users.sourceforge.jp> Revision: 1055 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1055 Author: shinsuke Date: 2008-07-14 06:47:50 +0900 (Mon, 14 Jul 2008) Log Message: ----------- clean up. Removed Paths: ------------- pal-portal/trunk/portal/files/applications/ pal-portal/trunk/portal/files/components/ pal-portal/trunk/portal/files/etc/ pal-portal/trunk/portal/files/layout-portlets/ pal-portal/trunk/portal/files/src/ pal-portal/trunk/portal/patches/applications/ pal-portal/trunk/portal/patches/commons/ pal-portal/trunk/portal/patches/components/ pal-portal/trunk/portal/patches/etc/ pal-portal/trunk/portal/patches/jetspeed-api/ pal-portal/trunk/portal/patches/layout-portlets/ pal-portal/trunk/portal/patches/maven-plugin/ pal-portal/trunk/portal/patches/project.properties pal-portal/trunk/portal/patches/src/ -------------- next part -------------- Deleted: pal-portal/trunk/portal/patches/project.properties =================================================================== --- pal-portal/trunk/portal/patches/project.properties 2008-07-10 13:46:55 UTC (rev 1054) +++ pal-portal/trunk/portal/patches/project.properties 2008-07-13 21:47:50 UTC (rev 1055) @@ -1,13 +0,0 @@ -Index: project.properties -=================================================================== ---- project.properties (¥ê¥Ó¥¸¥ç¥ó 553019) -+++ project.properties (ºî¶È¥³¥Ô¡¼) -@@ -52,7 +52,7 @@ - derby.include=true - - maven.mode.online = true --maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/, http://dist.codehaus.org/, http://people.apache.org/repository/ -+maven.repo.remote = http://www.bluesunrise.com/maven/, http://mirrors.ibiblio.org/pub/mirrors/maven/, http://dist.codehaus.org/, http://people.apache.org/repository/, http://maven.marevol.com/ - - # xdocs themes - maven.xdoc.theme = j2 From svnnotify ¡÷ sourceforge.jp Mon Jul 14 11:35:16 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 14 Jul 2008 11:35:16 +0900 Subject: [pal-cvs 3322] [1056] updated an internal build process(sync up with j2 2.2). Message-ID: <1216002916.125423.29427.nullmailer@users.sourceforge.jp> Revision: 1056 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1056 Author: shinsuke Date: 2008-07-14 11:35:15 +0900 (Mon, 14 Jul 2008) Log Message: ----------- updated an internal build process(sync up with j2 2.2). Modified Paths: -------------- pal-portal/trunk/build.properties pal-portal/trunk/build.xml pal-portal/trunk/override.properties.sample pal-portal/trunk/portal/build.xml Added Paths: ----------- pal-portal/trunk/portal/files/applications/ pal-portal/trunk/portal/files/applications/portal-app/ pal-portal/trunk/portal/files/applications/portal-app/pom.xml pal-portal/trunk/portal/files/applications/portal-app/src/ pal-portal/trunk/portal/files/applications/portal-app/src/etc/ pal-portal/trunk/portal/files/applications/portal-app/src/etc/dbpsml/ pal-portal/trunk/portal/files/applications/portal-app/src/etc/dbpsml/spring-filter-key.properties pal-portal/trunk/portal/files/settings.xml pal-portal/trunk/portal/patches/applications/ pal-portal/trunk/portal/patches/applications/jetspeed/ pal-portal/trunk/portal/patches/applications/jetspeed/pom.xml pal-portal/trunk/portal/patches/applications/jetspeed-demo/ pal-portal/trunk/portal/patches/applications/jetspeed-demo/pom.xml pal-portal/trunk/portal/patches/applications/jetspeed-dependencies/ pal-portal/trunk/portal/patches/applications/jetspeed-dependencies/pom.xml pal-portal/trunk/portal/patches/applications/jetspeed-layouts/ pal-portal/trunk/portal/patches/applications/jetspeed-layouts/pom.xml pal-portal/trunk/portal/patches/applications/pom.xml pal-portal/trunk/portal/patches/components/ pal-portal/trunk/portal/patches/components/jetspeed-capability/ pal-portal/trunk/portal/patches/components/jetspeed-capability/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-cm/ pal-portal/trunk/portal/patches/components/jetspeed-cm/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-db-tools/ pal-portal/trunk/portal/patches/components/jetspeed-db-tools/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-deploy-tools/ pal-portal/trunk/portal/patches/components/jetspeed-deploy-tools/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-file-cache/ pal-portal/trunk/portal/patches/components/jetspeed-file-cache/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-header-resource/ pal-portal/trunk/portal/patches/components/jetspeed-header-resource/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-id-generator/ pal-portal/trunk/portal/patches/components/jetspeed-id-generator/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-layout-portlets/ pal-portal/trunk/portal/patches/components/jetspeed-layout-portlets/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-locator/ pal-portal/trunk/portal/patches/components/jetspeed-locator/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-page-manager/ pal-portal/trunk/portal/patches/components/jetspeed-page-manager/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-portal/ pal-portal/trunk/portal/patches/components/jetspeed-portal/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-portal-site/ pal-portal/trunk/portal/patches/components/jetspeed-portal-site/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-portlet-factory/ pal-portal/trunk/portal/patches/components/jetspeed-portlet-factory/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-prefs/ pal-portal/trunk/portal/patches/components/jetspeed-prefs/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-profiler/ pal-portal/trunk/portal/patches/components/jetspeed-profiler/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-rdbms/ pal-portal/trunk/portal/patches/components/jetspeed-rdbms/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-registry/ pal-portal/trunk/portal/patches/components/jetspeed-registry/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-rewriter/ pal-portal/trunk/portal/patches/components/jetspeed-rewriter/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-search/ pal-portal/trunk/portal/patches/components/jetspeed-search/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-security/ pal-portal/trunk/portal/patches/components/jetspeed-security/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-serializer/ pal-portal/trunk/portal/patches/components/jetspeed-serializer/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-sso/ pal-portal/trunk/portal/patches/components/jetspeed-sso/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-statistics/ pal-portal/trunk/portal/patches/components/jetspeed-statistics/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-utils/ pal-portal/trunk/portal/patches/components/jetspeed-utils/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-web-content/ pal-portal/trunk/portal/patches/components/jetspeed-web-content/pom.xml pal-portal/trunk/portal/patches/components/jetspeed-webapp-logging/ pal-portal/trunk/portal/patches/components/jetspeed-webapp-logging/pom.xml pal-portal/trunk/portal/patches/components/pom.xml pal-portal/trunk/portal/patches/jetspeed-api/ pal-portal/trunk/portal/patches/jetspeed-api/pom.xml pal-portal/trunk/portal/patches/jetspeed-commons/ pal-portal/trunk/portal/patches/jetspeed-commons/pom.xml pal-portal/trunk/portal/patches/jetspeed-portal-resources/ pal-portal/trunk/portal/patches/jetspeed-portal-resources/pom.xml pal-portal/trunk/portal/patches/maven/ pal-portal/trunk/portal/patches/maven/jetspeed-archetype/ pal-portal/trunk/portal/patches/maven/jetspeed-archetype/pom.xml pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/ pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/main/ pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/main/resources/ pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/main/resources/archetype-resources/ pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml pal-portal/trunk/portal/patches/maven/jetspeed-db-maven-plugin/ pal-portal/trunk/portal/patches/maven/jetspeed-db-maven-plugin/pom.xml pal-portal/trunk/portal/patches/maven/jetspeed-deploy-maven-plugin/ pal-portal/trunk/portal/patches/maven/jetspeed-deploy-maven-plugin/pom.xml pal-portal/trunk/portal/patches/maven/jetspeed-maven-utils/ pal-portal/trunk/portal/patches/maven/jetspeed-maven-utils/pom.xml pal-portal/trunk/portal/patches/maven/jetspeed-unpack-maven-plugin/ pal-portal/trunk/portal/patches/maven/jetspeed-unpack-maven-plugin/pom.xml pal-portal/trunk/portal/patches/maven/pom.xml pal-portal/trunk/portal/patches/pom.xml -------------- next part -------------- Modified: pal-portal/trunk/build.properties =================================================================== --- pal-portal/trunk/build.properties 2008-07-13 21:47:50 UTC (rev 1055) +++ pal-portal/trunk/build.properties 2008-07-14 02:35:15 UTC (rev 1056) @@ -3,8 +3,8 @@ # container.name=PAL Portal container.separator=/ -container.version.major=1 -container.version.minor=0.5-dev +container.version.major=2 +container.version.minor=0-SNAPSHOT container.info.file=commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties portlets.home=${basedir}/portlets portlets.build.dir=${portlets.home}/build @@ -17,6 +17,7 @@ portal.manager.password=manager portal.site.password=site portal.dir=${portal.home}/jetspeed-2 +portal.setting.file=${portal.dir}/settings.xml portal.resource.dir=${portal.home}/resources portal.psml.dir=${portal.resource.dir}/psml portal.psml.name=default @@ -36,202 +37,85 @@ dist.server.shared=${dist.server.home}/shared/lib dist.server.war.dir=${dist.server.home}/webapps/ -upgrade.dir=${basedir}/upgrade -upgrade.build.dir=${upgrade.dir}/target - - # -# Tomcat -# -portlets.deploy.war.dir=${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}/WEB-INF/deploy - - -# # Jetspeed # -org.apache.jetspeed.portal.home=${portal.build.dir}/palportal -org.apache.jetspeed.portal.groupId=jp.sf.pal -org.apache.jetspeed.portal.artifactId=palportal -org.apache.jetspeed.portal.name=PAL Portal Server -org.apache.jetspeed.portal.currentVersion=${portal.version} +jp.sf.pal.portal.home=${portal.dir}/applications/portal-app +jp.sf.pal.portal.groupId=jp.sf.pal +jp.sf.pal.portal.artifactId=palportal +jp.sf.pal.portal.name=PAL Portal Server +jp.sf.pal.portal.currentVersion=${portal.version} +jp.sf.pal.portal.context.name=palportal # Jetspeed SVN revision -#jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/trunk/ -#jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/JETSPEED-2.1.3/ -jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/portal/branches/JETSPEED-2.1.3-POSTRELEASE/ -jetspeed2.revision=648465 +jetspeed2.svn.repository=http://svn.apache.org/repos/asf/portals/jetspeed-2/portal/trunk/ +jetspeed2.revision=674290 # Dependencies for Jetspeed -jetspeed.version=2.1.3_pal-${portal.version} -pluto.version=1.0.1 -portlet.api.version=1.0 -servlet.api.version=2.3 -myfaces.version=1.1.5 -bridges.groupId=org.apache.portals.bridges -portals.bridges.version=1.0.4 -portals.bridges.common.version=1.0.4 -portals.bridges.frameworks.version=1.0.4 -portals.bridges.jsf.version=1.0.4 -portals.bridges.perl.version=1.0.4 -portals.bridges.php.version=1.0.4 -portals.bridges.struts.version=1.2.7-1.0.4 -portals.bridges.jpetstore.version=1.0.4 -portals.bridges.velocity.version=1.0.4 -portals.bridges.groovy.version=1.0.4 -portals.bridges.portletfilter.version=1.0.4 -commons.logging.version=1.1 -spring.version=2.0.5 -spring.modules.version=2.0-rc2 -derby.version=10.1.1.0 -hsql.version=1.8.0.2 +jetspeed.version=2.2-SNAPSHOT_pal-${portal.version} +# Portlet version +jp.sf.pal.pal-admin.version=1.1 +jp.sf.pal.pal-wcm.version=0.3 + jetspeed2.build.options=\ --Djetspeed.version="${jetspeed.version}" \ --Dpluto.version=${pluto.version} \ --Dmaven.test.skip=true \ --Dorg.apache.jetspeed.portal.home="${org.apache.jetspeed.portal.home}" \ --Dorg.apache.jetspeed.portal.groupId="${org.apache.jetspeed.portal.groupId}" \ --Dorg.apache.jetspeed.portal.artifactId="${org.apache.jetspeed.portal.artifactId}" \ --Dorg.apache.jetspeed.portal.name="${org.apache.jetspeed.portal.name}" \ --Dorg.apache.jetspeed.portal.currentVersion="${org.apache.jetspeed.portal.currentVersion}" \ --Dportals.bridges.version="${portals.bridges.version}" \ --Dbridges.groupId="${bridges.groupId}" \ --Dportals.bridges.common.version="${portals.bridges.common.version}" \ --Dportals.bridges.frameworks.version="${portals.bridges.frameworks.version}" \ --Dportals.bridges.jsf.version="${portals.bridges.jsf.version}" \ --Dportals.bridges.perl.version="${portals.bridges.perl.version}" \ --Dportals.bridges.php.version="${portals.bridges.php.version}" \ --Dportals.bridges.struts.version="${portals.bridges.struts.version}" \ --Dportals.bridges.velocity.version="${portals.bridges.velocity.version}" \ --Dportals.bridges.portletfilter.version="${portals.bridges.portletfilter.version}" \ --Dcommons.logging.version="${commons.logging.version}" \ --Dderby.version="${derby.version}" \ --Dhsql.version="${hsql.version}" \ --Dportlet.api.version="${portlet.api.version}" \ --Dservlet.api.version="${servlet.api.version}" \ --Dmyfaces.version="${myfaces.version}" \ --Dspring.version="${spring.version}" \ --Dspring.modules.version="${spring.modules.version}" \ +-Djp.sf.pal.portal.groupId=${jp.sf.pal.portal.groupId} \ +-Djp.sf.pal.portal.artifactId=${jp.sf.pal.portal.artifactId} \ +-Djp.sf.pal.portal.name="${jp.sf.pal.portal.name}" \ +-Djp.sf.pal.portal.currentVersion=${jp.sf.pal.portal.currentVersion} \ +-Djp.sf.pal.portal.jetspeed.version=${jetspeed.version} \ +-Djp.sf.pal.portal.context.name=${jp.sf.pal.portal.context.name} \ +-Djp.sf.pal.pal-admin.version=${jp.sf.pal.pal-admin.version} \ +-Djp.sf.pal.pal-wcm.version=${jp.sf.pal.pal-wcm.version} \ -jetspeed2.deploy.base.options=\ --Djetspeed.version="${jetspeed.version}" \ --Dorg.apache.jetspeed.catalina.version.major=${org.apache.jetspeed.catalina.version.major} \ --Dorg.apache.jetspeed.services.autodeployment.user=${org.apache.jetspeed.services.autodeployment.user} \ --Dorg.apache.jetspeed.services.autodeployment.password=${org.apache.jetspeed.services.autodeployment.password} \ --Dorg.apache.jetspeed.production.database.default.name=${org.apache.jetspeed.production.database.default.name} \ --Dorg.apache.jetspeed.production.database.url="${org.apache.jetspeed.production.database.url}" \ --Dorg.apache.jetspeed.production.database.driver=${org.apache.jetspeed.production.database.driver} \ --Dorg.apache.jetspeed.production.database.user=${org.apache.jetspeed.production.database.user} \ --Dorg.apache.jetspeed.production.database.password=${org.apache.jetspeed.production.database.password} \ --Dorg.apache.jetspeed.production.jdbc.drivers.path=${org.apache.jetspeed.production.jdbc.drivers.path} \ - -jetspeed2.deploy.options=\ --Dorg.apache.jetspeed.server.home=${org.apache.jetspeed.server.home} \ --Dorg.apache.jetspeed.server.shared=${org.apache.jetspeed.server.shared} \ --Dorg.apache.jetspeed.deploy.war.dir=${org.apache.jetspeed.deploy.war.dir} \ - -jetspeed2.dist.deploy.options=\ --Dorg.apache.jetspeed.server.home=${dist.server.home} \ --Dorg.apache.jetspeed.server.shared=${dist.server.shared} \ --Dorg.apache.jetspeed.deploy.war.dir=${dist.server.war.dir} \ - -jetspeed2.upgrade.deploy.options=\ --Dorg.apache.jetspeed.server.home=${upgrade.build.dir}/distribution/${org.apache.jetspeed.portal.artifactId}-upgrade-${portal.version} \ --Dorg.apache.jetspeed.server.shared=${upgrade.build.dir}/distribution/${org.apache.jetspeed.portal.artifactId}-upgrade-${portal.version}/shared/lib \ --Dorg.apache.jetspeed.deploy.war.dir=${upgrade.build.dir}/distribution/${org.apache.jetspeed.portal.artifactId}-upgrade-${portal.version}/webapps \ - -jetspeed2.installer.options=\ --Dportal.dir="${portal.dir}" \ --Dorg.apache.jetspeed.portal.groupId="${org.apache.jetspeed.portal.groupId}" \ --Dorg.apache.jetspeed.portal.artifactId="${org.apache.jetspeed.portal.artifactId}" \ --Dorg.apache.jetspeed.portal.name="${org.apache.jetspeed.portal.name}" \ --Dorg.apache.jetspeed.portal.currentVersion="${org.apache.jetspeed.portal.currentVersion}" \ --Djetspeed.version="${jetspeed.version}" \ --Dportal.psml.dir="${portal.psml.dir}" \ --Dportal.psml.name="${portal.psml.name}" \ --Ddist.name.prefix="${dist.name.prefix}" \ --Ddist.version="${dist.version}" \ --Ddist.tomcat.base.url=${dist.tomcat.base.url} \ --Ddist.tomcat.base.file=${dist.tomcat.base.file} \ --Ddist.tomcat.version=${dist.tomcat.version} \ --Dinstaller.target.dir=${installer.target.dir} \ --Dcontainer.name="${container.name}" \ - portal.patch.files=\ -components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesImpl.java,\ -components/capability/src/java/org/apache/jetspeed/capabilities/impl/JetspeedCapabilities.java,\ -components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionMonitorImpl.java,\ -components/portal/src/java/org/apache/jetspeed/container/session/PortalSessionsManagerImpl.java,\ -components/profiler/src/java/org/apache/jetspeed/profiler/rules/impl/RuleCriterionImpl.java,\ -components/page-manager/src/test/org/apache/jetspeed/page/DirectoryXMLTransform.java,\ -components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java,\ -components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java,\ -components/page-manager/src/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java,\ -components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java,\ -components/cm/src/java/org/apache/jetspeed/cache/impl/JetspeedCacheKeyGenerator.java,\ -components/portal/src/java/org/apache/jetspeed/profiler/impl/CreateUserTemplatePagesValveImpl.java,\ -components/portal/src/java/org/apache/jetspeed/container/ContainerValve.java,\ -components/portal/src/java/org/apache/jetspeed/decoration/AbstractDecoratorActionsFactory.java,\ -components/portal/src/java/org/apache/jetspeed/decoration/DecorationValve.java,\ -components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityCustomizerValveImpl.java,\ -components/portal/src/java/org/apache/jetspeed/tools/pamanager/VersionedPortletApplicationManager.java,\ -components/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java,\ -components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,\ -components/portal/src/java/org/apache/jetspeed/login/LoginErrorServlet.java,\ -components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_ja.properties,\ -components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources.properties,\ -components/portal/src/java/org/apache/jetspeed/login/resources/LoginViewResources_en.properties,\ -components/portal/src/java/org/apache/jetspeed/layout/impl/BasePortletAction.java,\ -components/portal/src/java/org/apache/jetspeed/layout/impl/GetUserInformationAction.java,\ -components/portal/src/java/org/apache/jetspeed/layout/impl/BaseUserAction.java,\ -components/portal/src/java/org/apache/jetspeed/layout/impl/PortletPlacementContextImpl.java,\ -components/portal/src/java/org/apache/jetspeed/layout/impl/GetPageAction.java,\ -components/portal/src/java/org/apache/jetspeed/layout/impl/MovePortletAction.java,\ -components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java,\ -components/rdbms/src/java/org/apache/jetspeed/components/datasource/BoundDBCPDatasourceComponent.java,\ -components/security/src/java/org/apache/jetspeed/security/impl/AuthenticationProviderProxyImpl.java,\ -components/security/src/java/org/apache/jetspeed/security/spi/impl/LdapUserSecurityHandler.java,\ -components/security/src/java/org/apache/jetspeed/security/spi/impl/DefaultUserSecurityHandler.java,\ -components/security/src/java/org/apache/jetspeed/security/spi/impl/SecurityAccessImpl.java,\ -layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource.properties,\ -layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_en.properties,\ -layout-portlets/src/java/org/apache/jetspeed/portlets/layout/resources/LayoutResource_ja.properties,\ -layout-portlets/src/webapp/WEB-INF/portlet.xml,\ -layout-portlets/src/webapp/WEB-INF/jetspeed-portlet.xml,\ -src/webapp/WEB-INF/assembly/jetspeed-services.xml,\ -src/webapp/WEB-INF/assembly/pipelines.xml,\ -src/webapp/WEB-INF/assembly/statistics.xml,\ -src/webapp/WEB-INF/assembly/prefs.xml,\ -src/webapp/WEB-INF/web.xml,\ -src/webapp/decorations/portlet/decorator.vm,\ -project.properties,\ -maven-plugin/plugin.jelly,\ -jetspeed-api/src/java/org/apache/jetspeed/aggregator/WorkerMonitor.java,\ -jetspeed-api/src/java/org/apache/jetspeed/security/spi/UserSecurityHandler.java,\ -jetspeed-api/src/java/org/apache/jetspeed/security/spi/SecurityAccess.java,\ -jetspeed-api/src/java/org/apache/jetspeed/security/AuthenticationProviderProxy.java,\ -commons/src/java/org/apache/jetspeed/container/resources/ContainerInfo.properties,\ -commons/src/java/org/apache/jetspeed/portlet/PortletObjectProxy.java,\ -etc/sql/derby/schema/prefs-schema.sql,\ -etc/sql/derby/schema/phase2-schema.sql,\ -etc/schema/phase2-schema.xml,\ -etc/schema/prefs-schema.xml,\ +components/jetspeed-prefs/pom.xml,\ +components/jetspeed-file-cache/pom.xml,\ +components/jetspeed-id-generator/pom.xml,\ +components/jetspeed-capability/pom.xml,\ +components/jetspeed-profiler/pom.xml,\ +components/jetspeed-db-tools/pom.xml,\ +components/jetspeed-page-manager/pom.xml,\ +components/jetspeed-web-content/pom.xml,\ +components/jetspeed-layout-portlets/pom.xml,\ +components/pom.xml,\ +components/jetspeed-statistics/pom.xml,\ +components/jetspeed-deploy-tools/pom.xml,\ +components/jetspeed-portlet-factory/pom.xml,\ +components/jetspeed-cm/pom.xml,\ +components/jetspeed-utils/pom.xml,\ +components/jetspeed-portal/pom.xml,\ +components/jetspeed-webapp-logging/pom.xml,\ +components/jetspeed-portal-site/pom.xml,\ +components/jetspeed-locator/pom.xml,\ +components/jetspeed-rewriter/pom.xml,\ +components/jetspeed-sso/pom.xml,\ +components/jetspeed-search/pom.xml,\ +components/jetspeed-rdbms/pom.xml,\ +components/jetspeed-security/pom.xml,\ +components/jetspeed-registry/pom.xml,\ +components/jetspeed-serializer/pom.xml,\ +components/jetspeed-header-resource/pom.xml,\ +applications/jetspeed-layouts/pom.xml,\ +applications/jetspeed/pom.xml,\ +applications/jetspeed-demo/pom.xml,\ +applications/jetspeed-dependencies/pom.xml,\ +applications/pom.xml,\ +pom.xml,\ +maven/jetspeed-unpack-maven-plugin/pom.xml,\ +maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml,\ +maven/jetspeed-archetype/pom.xml,\ +maven/jetspeed-maven-utils/pom.xml,\ +maven/jetspeed-db-maven-plugin/pom.xml,\ +maven/pom.xml,\ +maven/jetspeed-deploy-maven-plugin/pom.xml,\ +jetspeed-portal-resources/pom.xml,\ +jetspeed-api/pom.xml,\ +jetspeed-commons/pom.xml,\ portal.delete.files=\ -src/webapp/WEB-INF/conf/override.properties,\ portal.delete.directories=\ -src/webapp/WEB-INF/pages/,\ -src/webapp/desktop-themes/,\ -src/webapp/logs/,\ -src/webapp/javascript/jetspeed,\ -src/webapp/javascript/swfobject,\ -src/webapp/decorations/layout/blueocean,\ -src/webapp/decorations/layout/sunflower,\ -src/webapp/decorations/layout/thesolution,\ -src/webapp/decorations/layout/jetspeed,\ -src/webapp/decorations/layout/tigris,\ -src/webapp/decorations/layout/jscookmenu,\ # # Portlets Modified: pal-portal/trunk/build.xml =================================================================== --- pal-portal/trunk/build.xml 2008-07-13 21:47:50 UTC (rev 1055) +++ pal-portal/trunk/build.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -181,7 +181,7 @@ - + - + @@ -79,7 +79,7 @@ description="--> Update portal"> - + @@ -176,6 +176,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -239,74 +374,54 @@ failonerror="true" dir="${portal.dir}" > - + - - - - - - - - - - - - - + - + - + - + - + + - + - + - + Added: pal-portal/trunk/portal/files/applications/portal-app/pom.xml =================================================================== --- pal-portal/trunk/portal/files/applications/portal-app/pom.xml (rev 0) +++ pal-portal/trunk/portal/files/applications/portal-app/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,406 @@ + + + + + 4.0.0 + + 2.0.9 + + + ${jp.sf.pal.portal.groupId} + ${jp.sf.pal.portal.artifactId} + ${jp.sf.pal.portal.currentVersion} + ${jp.sf.pal.portal.name} + Portal Application + + war + + + + org.apache.portals.jetspeed-2 + jetspeed + ${jp.sf.pal.portal.jetspeed.version} + war + runtime + + + org.apache.portals.jetspeed-2 + jetspeed-dependencies + ${jp.sf.pal.portal.jetspeed.version} + pom + + + + + 1.0 + 1.0.1 + 1.0.4 + + + + ${jp.sf.pal.portal.context.name} + + + org.apache.portals.jetspeed-2 + jetspeed-unpack-maven-plugin + ${jp.sf.pal.portal.jetspeed.version} + + + unpack-appserver + + unpack + + process-resources + + + org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar + ${project.build.directory}/resources/META-INF + + + conf/tomcat + context.xml + + + + + + + + + org.apache.portals.jetspeed-2 + jetspeed-portal-resources + ${jp.sf.pal.portal.jetspeed.version} + + + + + org.apache.portals.jetspeed-2 + jetspeed-deploy-maven-plugin + ${jp.sf.pal.portal.jetspeed.version} + + + deploy-jetspeed-layouts + + deploy + + process-resources + + ${project.build.directory}/${project.build.finalName} + + WEB-INF/deploy/local + + + + org.apache.portals.jetspeed-2:jetspeed-layouts:war + local + + + + + + + + org.apache.portals.jetspeed-2 + jetspeed-layouts + ${jp.sf.pal.portal.jetspeed.version} + war + + + + + org.apache.maven.plugins + maven-war-plugin + 2.0.2 + + + + ${project.build.directory}/resources + true + + + + + + + + + + demo + + + + + org.apache.portals.jetspeed-2 + jetspeed-db-maven-plugin + ${jp.sf.pal.portal.jetspeed.version} + + init + + + + ${org.apache.jetspeed.production.database.user} + ${org.apache.jetspeed.production.database.password} + ${org.apache.jetspeed.production.database.url} + ${org.apache.jetspeed.production.database.driver} + + + org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar + + + ddl + ${org.apache.jetspeed.production.database.default.name}/ + db/ddl + + + seed + db/seed + + + + + + + + + + + serializer + + ${project.build.directory}/${project.build.finalName}/WEB-INF/conf/spring-filter.properties + + ${project.build.directory}/${project.build.finalName} + + ${project.build.directory}/db/seed/j2-seed.xml + + + + ${org.apache.jetspeed.production.database.user} + + + ${org.apache.jetspeed.production.database.password} + + + ${org.apache.jetspeed.production.database.url} + + + ${org.apache.jetspeed.production.database.driver} + + + + + + + org.apache.portals.jetspeed-2 + jetspeed-portal-resources + ${jp.sf.pal.portal.jetspeed.version} + + + org.apache.portals.jetspeed-2 + jetspeed-db-tools + ${jp.sf.pal.portal.jetspeed.version} + + + ${org.apache.jetspeed.production.jdbc.driver.groupId} + ${org.apache.jetspeed.production.jdbc.driver.artifactId} + ${org.apache.jetspeed.production.jdbc.driver.version} + + + + + + org.apache.portals.jetspeed-2 + jetspeed-deploy-maven-plugin + ${jp.sf.pal.portal.jetspeed.version} + + ${org.apache.jetspeed.server.home} + ${jp.sf.pal.portal.context.name} + + + + portlet-api:portlet-api:jar + + + org.apache.portals.jetspeed-2:jetspeed-api:jar + + + org.apache.portals.jetspeed-2:jetspeed-commons:jar + + + org.apache.pluto:pluto:jar + + + org.apache.portals.bridges:portals-bridges-common:jar + + + + ${org.apache.jetspeed.production.jdbc.driver.groupId}:${org.apache.jetspeed.production.jdbc.driver.artifactId}:jar + + system + + + + ${pom.groupId}:${pom.artifactId}:war + true + ${jp.sf.pal.portal.context.name} + ./${jp.sf.pal.portal.context.name} + + + + jp.sf.pal:pal-admin:war + ./pal-admin + + + jp.sf.pal:pal-wcm:war + ./pal-wcm + + + + + + + ${pom.groupId} + ${pom.artifactId} + ${pom.version} + war + + + portlet-api + portlet-api + ${portlet-api.version} + + + org.apache.portals.jetspeed-2 + jetspeed-api + ${jp.sf.pal.portal.jetspeed.version} + runtime + + + org.apache.portals.jetspeed-2 + jetspeed-commons + ${jp.sf.pal.portal.jetspeed.version} + + + org.apache.pluto + pluto + ${org.apache.pluto.version} + + + org.apache.portals.bridges + portals-bridges-common + ${org.apache.portals.bridges.common.version} + + + ${org.apache.jetspeed.production.jdbc.driver.groupId} + ${org.apache.jetspeed.production.jdbc.driver.artifactId} + ${org.apache.jetspeed.production.jdbc.driver.version} + + + + jp.sf.pal + pal-admin + ${jp.sf.pal.pal-admin.version} + war + + + + jp.sf.pal + pal-wcm + ${jp.sf.pal.pal-wcm.version} + war + + + + + org.apache.portals.jetspeed-2 + jetspeed-deploy-tools + ${jp.sf.pal.portal.jetspeed.version} + + + + + + + + + demo-dbpsml + + + + org.apache.portals.jetspeed-2 + jetspeed-db-maven-plugin + ${jp.sf.pal.portal.jetspeed.version} + + init + + + + pageSerializer + + ${project.build.directory}/${project.build.finalName}/WEB-INF/conf/spring-filter.properties + + ${project.build.directory}/${project.build.finalName} + + + ${org.apache.jetspeed.production.database.user} + + + ${org.apache.jetspeed.production.database.password} + + + ${org.apache.jetspeed.production.database.url} + + + ${org.apache.jetspeed.production.database.driver} + + + + + + + + + + + dbpsml + + + + ${basedir}/src/etc/dbpsml + + spring-filter-key.properties + + ../${project.build.finalName}/WEB-INF/conf + + + + + + + Property changes on: pal-portal/trunk/portal/files/applications/portal-app/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/files/applications/portal-app/src/etc/dbpsml/spring-filter-key.properties =================================================================== --- pal-portal/trunk/portal/files/applications/portal-app/src/etc/dbpsml/spring-filter-key.properties (rev 0) +++ pal-portal/trunk/portal/files/applications/portal-app/src/etc/dbpsml/spring-filter-key.properties 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,17 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Use this to override settings in jetspeed.properties +spring.filter.key=portal.dbPageManager Property changes on: pal-portal/trunk/portal/files/applications/portal-app/src/etc/dbpsml/spring-filter-key.properties ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/files/settings.xml =================================================================== --- pal-portal/trunk/portal/files/settings.xml (rev 0) +++ pal-portal/trunk/portal/files/settings.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,80 @@ + + + + + + org.apache.portals.jetspeed-2 + + + + + + + + jetspeed-settings + + true + + + + + + @@org.apache.jetspeed.server.home@@ + @@org.apache.jetspeed.catalina.version.major@@ + @@org.apache.jetspeed.services.autodeployment.server@@ + @@org.apache.jetspeed.services.autodeployment.port@@ + + @@org.apache.jetspeed.services.autodeployment.user@@ + @@org.apache.jetspeed.services.autodeployment.password@@ + + + + + jetspeed-db-setting + + false + + + + @@org.apache.jetspeed.test.jdbc.driver.groupId@@ + @@org.apache.jetspeed.test.jdbc.driver.artifactId@@ + @@org.apache.jetspeed.test.jdbc.driver.version@@ + @@org.apache.jetspeed.test.jdbc.drivers.path@@ + @@org.apache.jetspeed.test.database.default.name@@ + @@org.apache.jetspeed.test.database.url@@ + @@org.apache.jetspeed.test.database.driver@@ + @@org.apache.jetspeed.test.database.user@@ + @@org.apache.jetspeed.test.database.password@@ + @@org.apache.jetspeed.production.jdbc.driver.groupId@@ + @@org.apache.jetspeed.production.jdbc.driver.artifactId@@ + @@org.apache.jetspeed.production.jdbc.driver.version@@ + @@org.apache.jetspeed.production.jdbc.drivers.path@@ + @@org.apache.jetspeed.production.database.default.name@@ + @@org.apache.jetspeed.production.database.url@@ + @@org.apache.jetspeed.production.database.driver@@ + @@org.apache.jetspeed.production.database.user@@ + @@org.apache.jetspeed.production.database.password@@ + + + + + jetspeed-db-setting + + Property changes on: pal-portal/trunk/portal/files/settings.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/applications/jetspeed/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/applications/jetspeed/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/applications/jetspeed/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: applications/jetspeed/pom.xml +=================================================================== +--- applications/jetspeed/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ applications/jetspeed/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + applications +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + war + Property changes on: pal-portal/trunk/portal/patches/applications/jetspeed/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/applications/jetspeed-demo/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/applications/jetspeed-demo/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/applications/jetspeed-demo/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: applications/jetspeed-demo/pom.xml +=================================================================== +--- applications/jetspeed-demo/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ applications/jetspeed-demo/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -27,7 +27,7 @@ + + org.apache.portals.jetspeed-2 + jetspeed-demo +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + Jetspeed-2 Demo Portal Application + Jetspeed-2 Demo Portal Application + Property changes on: pal-portal/trunk/portal/patches/applications/jetspeed-demo/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/applications/jetspeed-dependencies/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/applications/jetspeed-dependencies/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/applications/jetspeed-dependencies/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: applications/jetspeed-dependencies/pom.xml +=================================================================== +--- applications/jetspeed-dependencies/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ applications/jetspeed-dependencies/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -32,7 +32,7 @@ + + org.apache.portals.jetspeed-2 + applications +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + pom + Property changes on: pal-portal/trunk/portal/patches/applications/jetspeed-dependencies/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/applications/jetspeed-layouts/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/applications/jetspeed-layouts/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/applications/jetspeed-layouts/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: applications/jetspeed-layouts/pom.xml +=================================================================== +--- applications/jetspeed-layouts/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ applications/jetspeed-layouts/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + applications +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + war + Property changes on: pal-portal/trunk/portal/patches/applications/jetspeed-layouts/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/applications/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/applications/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/applications/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,21 @@ +Index: applications/pom.xml +=================================================================== +--- applications/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ applications/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + jetspeed-2 +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + pom + +@@ -40,6 +40,7 @@ + jetspeed-layouts + jetspeed + jetspeed-demo ++ portal-app + + + Property changes on: pal-portal/trunk/portal/patches/applications/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-capability/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-capability/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-capability/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-capability/pom.xml +=================================================================== +--- components/jetspeed-capability/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-capability/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -35,7 +35,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-capability/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-cm/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-cm/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-cm/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-cm/pom.xml +=================================================================== +--- components/jetspeed-cm/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-cm/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-cm/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-db-tools/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-db-tools/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-db-tools/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-db-tools/pom.xml +=================================================================== +--- components/jetspeed-db-tools/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-db-tools/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-db-tools/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-deploy-tools/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-deploy-tools/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-deploy-tools/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-deploy-tools/pom.xml +=================================================================== +--- components/jetspeed-deploy-tools/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-deploy-tools/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-deploy-tools/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-file-cache/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-file-cache/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-file-cache/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-file-cache/pom.xml +=================================================================== +--- components/jetspeed-file-cache/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-file-cache/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-file-cache/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-header-resource/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-header-resource/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-header-resource/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-header-resource/pom.xml +=================================================================== +--- components/jetspeed-header-resource/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-header-resource/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-header-resource/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-id-generator/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-id-generator/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-id-generator/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-id-generator/pom.xml +=================================================================== +--- components/jetspeed-id-generator/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-id-generator/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-id-generator/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-layout-portlets/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-layout-portlets/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-layout-portlets/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-layout-portlets/pom.xml +=================================================================== +--- components/jetspeed-layout-portlets/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-layout-portlets/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-layout-portlets/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-locator/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-locator/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-locator/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-locator/pom.xml +=================================================================== +--- components/jetspeed-locator/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-locator/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -33,7 +33,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-locator/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-page-manager/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-page-manager/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-page-manager/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-page-manager/pom.xml +=================================================================== +--- components/jetspeed-page-manager/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-page-manager/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -33,7 +33,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-page-manager/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-portal/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-portal/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-portal/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-portal/pom.xml +=================================================================== +--- components/jetspeed-portal/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-portal/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-portal/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-portal-site/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-portal-site/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-portal-site/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-portal-site/pom.xml +=================================================================== +--- components/jetspeed-portal-site/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-portal-site/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-portal-site/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-portlet-factory/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-portlet-factory/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-portlet-factory/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-portlet-factory/pom.xml +=================================================================== +--- components/jetspeed-portlet-factory/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-portlet-factory/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-portlet-factory/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-prefs/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-prefs/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-prefs/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-prefs/pom.xml +=================================================================== +--- components/jetspeed-prefs/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-prefs/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-prefs/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-profiler/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-profiler/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-profiler/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-profiler/pom.xml +=================================================================== +--- components/jetspeed-profiler/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-profiler/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-profiler/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-rdbms/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-rdbms/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-rdbms/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-rdbms/pom.xml +=================================================================== +--- components/jetspeed-rdbms/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-rdbms/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -33,7 +33,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-rdbms/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-registry/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-registry/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-registry/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-registry/pom.xml +=================================================================== +--- components/jetspeed-registry/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-registry/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-registry/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-rewriter/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-rewriter/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-rewriter/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-rewriter/pom.xml +=================================================================== +--- components/jetspeed-rewriter/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-rewriter/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-rewriter/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-search/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-search/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-search/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-search/pom.xml +=================================================================== +--- components/jetspeed-search/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-search/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-search/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-security/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-security/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-security/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-security/pom.xml +=================================================================== +--- components/jetspeed-security/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-security/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-security/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-serializer/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-serializer/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-serializer/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-serializer/pom.xml +=================================================================== +--- components/jetspeed-serializer/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-serializer/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-serializer/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-sso/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-sso/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-sso/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-sso/pom.xml +=================================================================== +--- components/jetspeed-sso/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-sso/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-sso/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-statistics/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-statistics/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-statistics/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-statistics/pom.xml +=================================================================== +--- components/jetspeed-statistics/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-statistics/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-statistics/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-utils/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-utils/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-utils/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-utils/pom.xml +=================================================================== +--- components/jetspeed-utils/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-utils/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-utils/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-web-content/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-web-content/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-web-content/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-web-content/pom.xml +=================================================================== +--- components/jetspeed-web-content/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-web-content/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-web-content/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/jetspeed-webapp-logging/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/jetspeed-webapp-logging/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/jetspeed-webapp-logging/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/jetspeed-webapp-logging/pom.xml +=================================================================== +--- components/jetspeed-webapp-logging/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/jetspeed-webapp-logging/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -34,7 +34,7 @@ + + org.apache.portals.jetspeed-2 + components +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/components/jetspeed-webapp-logging/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/components/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/components/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/components/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: components/pom.xml +=================================================================== +--- components/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ components/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + jetspeed-2 +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + pom + Property changes on: pal-portal/trunk/portal/patches/components/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/jetspeed-api/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/jetspeed-api/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/jetspeed-api/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: jetspeed-api/pom.xml +=================================================================== +--- jetspeed-api/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ jetspeed-api/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + jetspeed-2 +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/jetspeed-api/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/jetspeed-commons/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/jetspeed-commons/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/jetspeed-commons/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: jetspeed-commons/pom.xml +=================================================================== +--- jetspeed-commons/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ jetspeed-commons/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -33,7 +33,7 @@ + + org.apache.portals.jetspeed-2 + jetspeed-2 +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/jetspeed-commons/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/jetspeed-portal-resources/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/jetspeed-portal-resources/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/jetspeed-portal-resources/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: jetspeed-portal-resources/pom.xml +=================================================================== +--- jetspeed-portal-resources/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ jetspeed-portal-resources/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + jetspeed-2 +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/jetspeed-portal-resources/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/maven/jetspeed-archetype/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/maven/jetspeed-archetype/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/maven/jetspeed-archetype/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: maven/jetspeed-archetype/pom.xml +=================================================================== +--- maven/jetspeed-archetype/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ maven/jetspeed-archetype/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -21,7 +21,7 @@ + 4.0.0 + org.apache.portals.jetspeed-2 + jetspeed-archetype +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + Jetspeed 2 Maven Archetype + http://maven.apache.org + Property changes on: pal-portal/trunk/portal/patches/maven/jetspeed-archetype/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml +=================================================================== +--- maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -52,7 +52,7 @@ + + + 1.0 +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + 1.0.1 + 1.0.4 + ${artifactId} Property changes on: pal-portal/trunk/portal/patches/maven/jetspeed-archetype/src/main/resources/archetype-resources/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/maven/jetspeed-db-maven-plugin/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/maven/jetspeed-db-maven-plugin/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/maven/jetspeed-db-maven-plugin/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: maven/jetspeed-db-maven-plugin/pom.xml +=================================================================== +--- maven/jetspeed-db-maven-plugin/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ maven/jetspeed-db-maven-plugin/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + maven +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + maven-plugin + Property changes on: pal-portal/trunk/portal/patches/maven/jetspeed-db-maven-plugin/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/maven/jetspeed-deploy-maven-plugin/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/maven/jetspeed-deploy-maven-plugin/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/maven/jetspeed-deploy-maven-plugin/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: maven/jetspeed-deploy-maven-plugin/pom.xml +=================================================================== +--- maven/jetspeed-deploy-maven-plugin/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ maven/jetspeed-deploy-maven-plugin/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + maven +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + maven-plugin + Property changes on: pal-portal/trunk/portal/patches/maven/jetspeed-deploy-maven-plugin/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/maven/jetspeed-maven-utils/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/maven/jetspeed-maven-utils/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/maven/jetspeed-maven-utils/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: maven/jetspeed-maven-utils/pom.xml +=================================================================== +--- maven/jetspeed-maven-utils/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ maven/jetspeed-maven-utils/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + maven +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + jar + Property changes on: pal-portal/trunk/portal/patches/maven/jetspeed-maven-utils/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/maven/jetspeed-unpack-maven-plugin/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/maven/jetspeed-unpack-maven-plugin/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/maven/jetspeed-unpack-maven-plugin/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: maven/jetspeed-unpack-maven-plugin/pom.xml +=================================================================== +--- maven/jetspeed-unpack-maven-plugin/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ maven/jetspeed-unpack-maven-plugin/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + maven +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + maven-plugin + Property changes on: pal-portal/trunk/portal/patches/maven/jetspeed-unpack-maven-plugin/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/maven/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/maven/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/maven/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,13 @@ +Index: maven/pom.xml +=================================================================== +--- maven/pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ maven/pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -31,7 +31,7 @@ + + org.apache.portals.jetspeed-2 + jetspeed-2 +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + + pom + Property changes on: pal-portal/trunk/portal/patches/maven/pom.xml ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/trunk/portal/patches/pom.xml =================================================================== --- pal-portal/trunk/portal/patches/pom.xml (rev 0) +++ pal-portal/trunk/portal/patches/pom.xml 2008-07-14 02:35:15 UTC (rev 1056) @@ -0,0 +1,28 @@ +Index: pom.xml +=================================================================== +--- pom.xml (¥ê¥Ó¥¸¥ç¥ó 674290) ++++ pom.xml (ºî¶È¥³¥Ô¡¼) +@@ -28,7 +28,7 @@ + org.apache.portals.jetspeed-2 + jetspeed-2 + Jetspeed-2 Enterprise Portal +- 2.2-SNAPSHOT ++ @@JETSPEED_VERSION@@ + pom + + Jetspeed is an Open Source implementation of an Enterprise Information Portal, using Java and XML. +@@ -1150,10 +1150,10 @@ + + 1.5 + 1.5 +- true +- true +- true +- false ++ false ++ false ++ false ++ true + + + Property changes on: pal-portal/trunk/portal/patches/pom.xml ___________________________________________________________________ Name: svn:eol-style + native From svnnotify ¡÷ sourceforge.jp Wed Jul 16 16:22:42 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 16 Jul 2008 16:22:42 +0900 Subject: [pal-cvs 3323] [1057] java 6 support Message-ID: <1216192962.420500.24422.nullmailer@users.sourceforge.jp> Revision: 1057 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1057 Author: sone Date: 2008-07-16 16:22:42 +0900 (Wed, 16 Jul 2008) Log Message: ----------- java 6 support Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java 2008-07-14 02:35:15 UTC (rev 1056) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/rdbms/ojb/ConnectionRepositoryEntry.java 2008-07-16 07:22:42 UTC (rev 1057) @@ -477,7 +477,7 @@ // #ifdef JDBC4 return getConnection().isWrapperFor(iface); } - T unwrap(Class iface) throws SQLException + public T unwrap(Class iface) throws SQLException { throw new SQLException("PoolingDataSource is not a wrapper."); // #ifdef JDBC4 return getConnection().unwrap(iface); From svnnotify ¡÷ sourceforge.jp Tue Jul 29 16:24:59 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 29 Jul 2008 16:24:59 +0900 Subject: [pal-cvs 3324] [1058] replaced with rollingfileappender. Message-ID: <1217316299.828765.12058.nullmailer@users.sourceforge.jp> Revision: 1058 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1058 Author: shinsuke Date: 2008-07-29 16:24:59 +0900 (Tue, 29 Jul 2008) Log Message: ----------- replaced with rollingfileappender. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/conf/Log4j.properties -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/conf/Log4j.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/conf/Log4j.properties 2008-07-16 07:22:42 UTC (rev 1057) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/conf/Log4j.properties 2008-07-29 07:24:59 UTC (rev 1058) @@ -66,30 +66,36 @@ # # jetspeed.log # -log4j.appender.jetspeed = org.apache.log4j.FileAppender -log4j.appender.jetspeed.file = ${applicationRoot}/WEB-INF/logs/jetspeed.log +log4j.appender.jetspeed = org.apache.log4j.RollingFileAppender +log4j.appender.jetspeed.File = ${applicationRoot}/WEB-INF/logs/jetspeed.log log4j.appender.jetspeed.layout = org.apache.log4j.PatternLayout -log4j.appender.jetspeed.layout.conversionPattern = %d [%t] %-5p %c - %m%n -log4j.appender.jetspeed.append = false +log4j.appender.jetspeed.layout.ConversionPattern = %d [%t] %-5p %c - %m%n +log4j.appender.jetspeed.Append = true +log4j.appender.jetspeed.MaxFileSize = 10MB +log4j.appender.jetspeed.MaxBackupIndex = 5 # # deployment.log # -log4j.appender.DEPLOYMENT = org.apache.log4j.FileAppender -log4j.appender.DEPLOYMENT.file = ${applicationRoot}/WEB-INF/logs/deployment.log +log4j.appender.DEPLOYMENT = org.apache.log4j.RollingFileAppender +log4j.appender.DEPLOYMENT.File = ${applicationRoot}/WEB-INF/logs/deployment.log log4j.appender.DEPLOYMENT.layout = org.apache.log4j.PatternLayout -log4j.appender.DEPLOYMENT.layout.conversionPattern = %d [%t] %-5p %c - %m%n -log4j.appender.DEPLOYMENT.append = false +log4j.appender.DEPLOYMENT.layout.ConversionPattern = %d [%t] %-5p %c - %m%n +log4j.appender.DEPLOYMENT.Append = true +log4j.appender.DEPLOYMENT.MaxFileSize = 10MB +log4j.appender.DEPLOYMENT.MaxBackupIndex = 5 # # Velocity gets configured to write its output onto the velocity # category. # -log4j.appender.velocity = org.apache.log4j.FileAppender -log4j.appender.velocity.file = ${applicationRoot}/WEB-INF/logs/velocity.log +log4j.appender.velocity = org.apache.log4j.RollingFileAppender +log4j.appender.velocity.File = ${applicationRoot}/WEB-INF/logs/velocity.log log4j.appender.velocity.layout = org.apache.log4j.PatternLayout -log4j.appender.velocity.layout.conversionPattern = %d [%t] %-5p %c - %m%n -log4j.appender.velocity.append = false +log4j.appender.velocity.layout.ConversionPattern = %d [%t] %-5p %c - %m%n +log4j.appender.velocity.Append = true +log4j.appender.velocity.MaxFileSize = 10MB +log4j.appender.velocity.MaxBackupIndex = 5 # # Console From svnnotify ¡÷ sourceforge.jp Tue Jul 29 16:29:06 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 29 Jul 2008 16:29:06 +0900 Subject: [pal-cvs 3325] [1059] updated to log4j 1.2.15 Message-ID: <1217316546.757278.15138.nullmailer@users.sourceforge.jp> Revision: 1059 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1059 Author: shinsuke Date: 2008-07-29 16:29:06 +0900 (Tue, 29 Jul 2008) Log Message: ----------- updated to log4j 1.2.15 Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties 2008-07-29 07:24:59 UTC (rev 1058) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/project.properties 2008-07-29 07:29:06 UTC (rev 1059) @@ -41,7 +41,7 @@ # Whether or not to include commons-logging in war files. Your container may already have this. commons.logging.include=true -log4j.version=1.2.14 +log4j.version=1.2.15 # Whether or not to include log4j in war files. Your container may already have this. log4j.include=true From svnnotify ¡÷ sourceforge.jp Tue Jul 29 17:00:40 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 29 Jul 2008 17:00:40 +0900 Subject: [pal-cvs 3326] [1060] added Experimental. Message-ID: <1217318440.604524.4898.nullmailer@users.sourceforge.jp> Revision: 1060 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1060 Author: shinsuke Date: 2008-07-29 17:00:40 +0900 (Tue, 29 Jul 2008) Log Message: ----------- added Experimental. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/resources/LanguagePack.properties pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/resources/LanguagePack_ja.properties -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/resources/LanguagePack.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/resources/LanguagePack.properties 2008-07-29 07:29:06 UTC (rev 1059) +++ pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/resources/LanguagePack.properties 2008-07-29 08:00:40 UTC (rev 1060) @@ -68,13 +68,13 @@ #setupDBAntTarget.displayText = comment.39.displayText = Please select the target database type you want to use for the portal. dbName.displayText = Database type -dbName.1.displayText = DB2 +dbName.1.displayText = DB2 (Experimental) dbName.2.displayText = Derby -dbName.3.displayText = MSSQL -dbName.4.displayText = MySql +dbName.3.displayText = MS SQL Server (Experimental) +dbName.4.displayText = MySQL dbName.5.displayText = PostgreSQL dbName.6.displayText = Oracle (9i or higher) -dbName.7.displayText = SapDB +dbName.7.displayText = SapDB (Experimental) dbName.8.displayText = Manual database setup ## Text from Page:mysql Modified: pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/resources/LanguagePack_ja.properties =================================================================== --- pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/resources/LanguagePack_ja.properties 2008-07-29 07:29:06 UTC (rev 1059) +++ pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/resources/LanguagePack_ja.properties 2008-07-29 08:00:40 UTC (rev 1060) @@ -68,13 +68,13 @@ #setupDBAntTarget.displayText = comment.39.displayText = \u30dd\u30fc\u30bf\u30eb\u7528\u306b\u5229\u7528\u3059\u308b\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 dbName.displayText = \u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u7a2e\u985e -dbName.1.displayText = DB2 +dbName.1.displayText = DB2 (Experimental) dbName.2.displayText = Derby -dbName.3.displayText = MSSQL -dbName.4.displayText = MySql +dbName.3.displayText = MS SQL Server (Experimental) +dbName.4.displayText = MySQL dbName.5.displayText = PostgreSQL -dbName.6.displayText = Oracle (9i or higher) -dbName.7.displayText = SapDB +dbName.6.displayText = Oracle (9i \u4ee5\u4e0a) +dbName.7.displayText = SapDB (Experimental) dbName.8.displayText = \u624b\u52d5\u3067\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u306e\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7 ## Text from Page:mysql From svnnotify ¡÷ sourceforge.jp Tue Jul 29 17:49:11 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 29 Jul 2008 17:49:11 +0900 Subject: [pal-cvs 3327] [1061] added eclipse files. Message-ID: <1217321351.211791.9100.nullmailer@users.sourceforge.jp> Revision: 1061 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1061 Author: shinsuke Date: 2008-07-29 17:49:11 +0900 (Tue, 29 Jul 2008) Log Message: ----------- added eclipse files. Added Paths: ----------- pal-portal/modules/ant-installer/trunk/.classpath pal-portal/modules/ant-installer/trunk/.project -------------- next part -------------- Added: pal-portal/modules/ant-installer/trunk/.classpath =================================================================== --- pal-portal/modules/ant-installer/trunk/.classpath (rev 0) +++ pal-portal/modules/ant-installer/trunk/.classpath 2008-07-29 08:49:11 UTC (rev 1061) @@ -0,0 +1,9 @@ + + + + + + + + + Property changes on: pal-portal/modules/ant-installer/trunk/.classpath ___________________________________________________________________ Name: svn:eol-style + native Added: pal-portal/modules/ant-installer/trunk/.project =================================================================== --- pal-portal/modules/ant-installer/trunk/.project (rev 0) +++ pal-portal/modules/ant-installer/trunk/.project 2008-07-29 08:49:11 UTC (rev 1061) @@ -0,0 +1,14 @@ + + ant-installer + Ant Installer + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.jdt.core.javanature + + Property changes on: pal-portal/modules/ant-installer/trunk/.project ___________________________________________________________________ Name: svn:eol-style + native From svnnotify ¡÷ sourceforge.jp Tue Jul 29 17:49:40 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 29 Jul 2008 17:49:40 +0900 Subject: [pal-cvs 3328] [1062] fixed NPE on cli installer. Message-ID: <1217321380.428328.9211.nullmailer@users.sourceforge.jp> Revision: 1062 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1062 Author: shinsuke Date: 2008-07-29 17:49:40 +0900 (Tue, 29 Jul 2008) Log Message: ----------- fixed NPE on cli installer. Modified Paths: -------------- pal-portal/modules/ant-installer/trunk/lib/ant-installer-ext.jar pal-portal/modules/ant-installer/trunk/lib/ant-installer.jar pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/AntProjectFilter.java -------------- next part -------------- Modified: pal-portal/modules/ant-installer/trunk/lib/ant-installer-ext.jar =================================================================== (Binary files differ) Modified: pal-portal/modules/ant-installer/trunk/lib/ant-installer.jar =================================================================== (Binary files differ) Modified: pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/AntProjectFilter.java =================================================================== --- pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/AntProjectFilter.java 2008-07-29 08:49:11 UTC (rev 1061) +++ pal-portal/modules/ant-installer/trunk/src/org/tp23/antinstaller/runtime/exe/AntProjectFilter.java 2008-07-29 08:49:40 UTC (rev 1062) @@ -130,6 +130,9 @@ while (iter.hasNext()) { arg = (String) iter.next(); value = (String) properties.get(arg); + if (value == null) { + value = ""; + } project.setUserProperty(arg, value); } From svnnotify ¡÷ sourceforge.jp Tue Jul 29 17:52:40 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 29 Jul 2008 17:52:40 +0900 Subject: [pal-cvs 3329] [1063] fixed NPE on cli installation. Message-ID: <1217321560.105590.11574.nullmailer@users.sourceforge.jp> Revision: 1063 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1063 Author: shinsuke Date: 2008-07-29 17:52:40 +0900 (Tue, 29 Jul 2008) Log Message: ----------- fixed NPE on cli installation. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/lib/ant-installer.jar -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/installer/etc/ant-installer/lib/ant-installer.jar =================================================================== (Binary files differ) From svnnotify ¡÷ sourceforge.jp Thu Jul 31 15:09:27 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 31 Jul 2008 15:09:27 +0900 Subject: [pal-cvs 3330] [1064] changed a page handling for guest user. Message-ID: <1217484567.731843.20484.nullmailer@users.sourceforge.jp> Revision: 1064 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1064 Author: shinsuke Date: 2008-07-31 15:09:27 +0900 (Thu, 31 Jul 2008) Log Message: ----------- changed a page handling for guest user. clean up profiling rules. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/folder.metadata pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/default-page.psml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/folder.metadata pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/page.security pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/site-editor.psml Added Paths: ----------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/_hostname/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/_hostname/folder.metadata pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/default-page.psml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/folder.metadata pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_group/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_group/folder.metadata pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_role/folder.metadata pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/default-page.psml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/folder.metadata Removed Paths: ------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_role/site/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/docomo-html/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/docomo-wap2/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/kddi-hdml/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/kddi-wap2/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/softbank-html/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/_mediatype/softbank-wap2/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/selector.psml -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-07-29 08:52:40 UTC (rev 1063) +++ pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-07-31 06:09:27 UTC (rev 1064) @@ -15,667 +15,481 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - - application/xhtml+xml - text/html - text/vnd.wap.wml - text/vxml - text/xhtml - text/xml - text/x-hdml - - - - - - <description value="Rich HTML for HTML 4.0 compliants browsers"/> - <capabilities></capabilities> - <mimeTypes>text/html</mimeTypes> - </MediaType> - <MediaType name="vxml"> - <charcterSet value="UTF-8"/> - <title value="VoiceXML"/> - <description value="Format suitable for use with an audio VoiceXML server"/> - <capabilities></capabilities> - <mimeTypes>text/vxml</mimeTypes> - </MediaType> - <MediaType name="wml"> - <charcterSet value="UTF-8"/> - <title value="WML"/> - <description value="Format for mobile phones and PDAs compatible with WML 1.1"/> - <capabilities></capabilities> - <mimeTypes>text/vnd.wap.wml</mimeTypes> - </MediaType> - <MediaType name="docomo-html"> - <charcterSet value="Shift_JIS"/> - <title value="DOCOMO1"/> - <description value="HTML for i-mode"/> - <capabilities></capabilities> - <mimeTypes>text/html</mimeTypes> - </MediaType> - <MediaType name="docomo-wap2"> - <charcterSet value="UTF-8"/> - <title value="DOCOMO2"/> - <description value="XHTML for i-mode"/> - <capabilities></capabilities> - <mimeTypes>application/xhtml+xml</mimeTypes> - </MediaType> - <MediaType name="kddi-hdml"> - <charcterSet value="Shift_JIS"/> - <title value="KDDI-HDML"/> - <description value="HDML for ezweb"/> - <capabilities></capabilities> - <mimeTypes>text/x-hdml</mimeTypes> - </MediaType> - <MediaType name="kddi-wap2"> - <charcterSet value="Shift_JIS"/> - <title value="KDDI-WAP2"/> - <description value="WAP 2.0 for ezweb"/> - <capabilities></capabilities> - <mimeTypes>application/xhtml+xml</mimeTypes> - </MediaType> - <MediaType name="softbank-html"> - <charcterSet value="Shift_JIS"/> - <title value="SOFTBANK-HTML"/> - <description value="HTML for Softbank phone"/> - <capabilities></capabilities> - <mimeTypes>text/html</mimeTypes> - </MediaType> - <MediaType name="softbank-wap2"> - <charcterSet value="UTF-8"/> - <title value="SOFTBANK-WAP2"/> - <description value="XHTML for Softbank phone"/> - <capabilities></capabilities> - <mimeTypes>application/xhtml+xml</mimeTypes> - </MediaType> - <MediaType name="xhtml-basic"> - <charcterSet value="UTF-8"/> - <title value="XHTML"/> - <description value="XHTML Basic"/> - <capabilities></capabilities> - <mimeTypes>application/xhtml+xml</mimeTypes> - </MediaType> - <MediaType name="xml"> - <charcterSet value=""/> - <title value="XML"/> - <description value="XML 1.0"/> - <capabilities></capabilities> - <mimeTypes>text/xml</mimeTypes> - </MediaType> - </MediaTypes> - <Capabilities> - <Capability>HTML_3_2</Capability> - <Capability>HTML_4_0</Capability> - <Capability>HTML_ACTIVEX</Capability> - <Capability>HTML_CSS1</Capability> - <Capability>HTML_CSS2</Capability> - <Capability>HTML_CSSP</Capability> - <Capability>HTML_DOM</Capability> - <Capability>HTML_DOM_1</Capability> - <Capability>HTML_DOM_2</Capability> - <Capability>HTML_DOM_IE</Capability> - <Capability>HTML_DOM_NS4</Capability> - <Capability>HTML_FORM</Capability> - <Capability>HTML_FRAME</Capability> - <Capability>HTML_IFRAME</Capability> - <Capability>HTML_IMAGE</Capability> - <Capability>HTML_JAVA</Capability> - <Capability>HTML_JAVA1_0</Capability> - <Capability>HTML_JAVA1_1</Capability> - <Capability>HTML_JAVA1_2</Capability> - <Capability>HTML_JAVASCRIPT</Capability> - <Capability>HTML_JAVASCRIPT_1_0</Capability> - <Capability>HTML_JAVASCRIPT_1_1</Capability> - <Capability>HTML_JAVASCRIPT_1_2</Capability> - <Capability>HTML_JAVA_JRE</Capability> - <Capability>HTML_JSCRIPT</Capability> - <Capability>HTML_JSCRIPT1_0</Capability> - <Capability>HTML_JSCRIPT1_1</Capability> - <Capability>HTML_JSCRIPT1_2</Capability> - <Capability>HTML_LAYER</Capability> - <Capability>HTML_NESTED_TABLE</Capability> - <Capability>HTML_PLUGIN</Capability> - <Capability>HTML_TABLE</Capability> - <Capability>HTML_XML</Capability> - <Capability>HTML_XSL</Capability> - <Capability>HTTP_1_1</Capability> - <Capability>HTTP_COOKIE</Capability> - <Capability>WML_1_0</Capability> - <Capability>WML_1_1</Capability> - <Capability>WML_TABLE</Capability> - <Capability>XML_XINCLUDE</Capability> - <Capability>XML_XPATH</Capability> - <Capability>XML_XSLT</Capability> - </Capabilities> - <Clients> - <Client name="ie5mac" evalOrder="1" preferredMimeTypeID="text/html"> - <userAgentPattern value=".*MSIE 5.*Mac.*"/> - <version value="5.*"/> - <model value="None"/> - <manufacturer value="Microsoft"/> - <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_PLUGIN,HTML_CSS1,HTML_DOM_NS4,HTTP_COOKIE</capabilities> - <mimeTypes>text/html</mimeTypes> - </Client> - <Client name="safari" evalOrder="2" preferredMimeTypeID="text/html"> - <userAgentPattern value=".*Mac.*Safari.*"/> - <version value="5.*"/> - <model value="None"/> - <manufacturer value="Apple"/> - <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities> - <mimeTypes>text/html,text/xml,text/xhtml</mimeTypes> - </Client> - <Client name="ie6" evalOrder="3" preferredMimeTypeID="text/html"> - <userAgentPattern value=".*MSIE 6.*"/> - <version value="6.0"/> - <model value="None"/> - <manufacturer value="Microsoft"/> - <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities> - <mimeTypes>text/html,text/xml,text/xhtml</mimeTypes> - </Client> - <Client name="ie5" evalOrder="4" preferredMimeTypeID="text/html"> - <userAgentPattern value=".*MSIE 5.*"/> - <version value="5.5"/> - <model value="None"/> - <manufacturer value="Microsoft"/> - <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities> - <mimeTypes>text/html,text/xml</mimeTypes> - </Client> - <Client name="ns4" evalOrder="5" preferredMimeTypeID="text/html"> - <userAgentPattern value=".*Mozilla/4.*"/> - <version value="4.75"/> - <model value="None"/> - <manufacturer value="Netscape"/> - <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_CSS1,HTML_LAYER,HTML_PLUGIN,HTML_DOM_NS4,HTTP_COOKIE</capabilities> - <mimeTypes>text/html</mimeTypes> - </Client> - <Client name="mozilla" evalOrder="6" preferredMimeTypeID="text/html"> - <userAgentPattern value=".*Mozilla/5.*"/> - <version value="1.x"/> - <model value="Mozilla"/> - <manufacturer value="Mozilla"/> - <capabilities>HTML_3_2,HTML_4_0,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IFRAME,HTML_IMAGE,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTML_PLUGIN,HTTP_COOKIE</capabilities> - <mimeTypes>text/html,text/xhtml,text/xml</mimeTypes> - </Client> - <Client name="lynx" evalOrder="7" preferredMimeTypeID="text/html"> - <userAgentPattern value="Lynx.*"/> - <version value=""/> - <model value="None"/> - <manufacturer value="GNU"/> - <capabilities>HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTTP_COOKIE</capabilities> - <mimeTypes>text/html</mimeTypes> - </Client> - <Client name="docomo-html" evalOrder="8" preferredMimeTypeID="text/html"> - <userAgentPattern value="DoCoMo/1.0.*"/> - <version value="1.0"/> - <model value="Generic"/> - <manufacturer value="WAP"/> - <capabilities></capabilities> - <mimeTypes>text/html</mimeTypes> - </Client> - <Client name="docomo-wap2" evalOrder="9" preferredMimeTypeID="application/xhtml+xml"> - <userAgentPattern value="DoCoMo/2.0.*"/> - <version value="2.0"/> - <model value="Generic"/> - <manufacturer value="WAP"/> - <capabilities></capabilities> - <mimeTypes>application/xhtml+xml</mimeTypes> - </Client> - <Client name="kddi-hdml" evalOrder="10" preferredMimeTypeID="text/x-hdml"> - <userAgentPattern value="UP.Browser.*"/> - <version value="1.0"/> - <model value="Generic"/> - <manufacturer value="WAP"/> - <capabilities></capabilities> - <mimeTypes>text/x-hdml</mimeTypes> - </Client> - <Client name="kddi-wap2" evalOrder="11" preferredMimeTypeID="application/xhtml+xml"> - <userAgentPattern value="KDDI-.*UP.Browser.*"/> - <version value="2.0"/> - <model value="Generic"/> - <manufacturer value="WAP"/> - <capabilities></capabilities> - <mimeTypes>application/xhtml+xml</mimeTypes> - </Client> - <Client name="softbank-html" evalOrder="12" preferredMimeTypeID="text/html"> - <userAgentPattern value="J-PHONE.*"/> - <version value="1.0"/> - <model value="Generic"/> - <manufacturer value="WAP"/> - <capabilities></capabilities> - <mimeTypes>text/html</mimeTypes> - </Client> - <Client name="softbank-wap2" evalOrder="13" preferredMimeTypeID="application/xhtml+xml"> - <userAgentPattern value="MOT-C980.*|MOT-V980.*|Vodafone.*|SoftBank.*"/> - <version value="2.0"/> - <model value="Generic"/> - <manufacturer value="WAP"/> - <capabilities></capabilities> - <mimeTypes>application/xhtml+xml</mimeTypes> - </Client> - <Client name="vxml_generic" evalOrder="14" preferredMimeTypeID="text/vxml"> - <userAgentPattern value=".*VoiceXML.*"/> - <version value=""/> - <model value="Generic"/> - <manufacturer value="Generic"/> - <capabilities></capabilities> - <mimeTypes>text/vxml</mimeTypes> - </Client> - <Client name="nuance" evalOrder="16" preferredMimeTypeID="text/vxml"> - <userAgentPattern value="Nuance.*"/> - <version value=""/> - <model value="Generic"/> - <manufacturer value="Nuance"/> - <capabilities></capabilities> - <mimeTypes>text/vxml</mimeTypes> - </Client> - <Client name="agentxml" evalOrder="17" preferredMimeTypeID="text/xml"> - <userAgentPattern value="agentxml/1.0.*"/> - <version value=""/> - <model value="Generic"/> - <manufacturer value="Unknown"/> - <capabilities></capabilities> - <mimeTypes>text/xml</mimeTypes> - </Client> - <Client name="opera7" evalOrder="18" preferredMimeTypeID="text/html"> - <userAgentPattern value=".*Opera/7.*"/> - <version value="7.x"/> - <model value="Opera7"/> - <manufacturer value="Opera"/> - <capabilities>HTML_3_2,HTML_4_0,HTML_TABLE,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_IFRAME,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTTP_COOKIE,HTML_PLUGIN</capabilities> - <mimeTypes>text/html,text/xml,text/xhtml</mimeTypes> - </Client> - </Clients> - <Roles> - <Role>admin</Role> - <Role>guest</Role> - <Role>user</Role> - <Role>site</Role> - <Role>siteadmin</Role> - </Roles> - <Groups> +<Snapshot xmlns="http://portals.apache.org/jetspeed" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="standard-jetspeed2.xml"> + <softwareVersion value="1"/> + <softwareSubVersion value="0"/> + <default_rule value="default"/> + <encryption value=""/> + <MimeTypes> + <MimeType>application/xhtml+xml</MimeType> + <MimeType>text/html</MimeType> + <MimeType>text/vnd.wap.wml</MimeType> + <MimeType>text/vxml</MimeType> + <MimeType>text/xhtml</MimeType> + <MimeType>text/xml</MimeType> + <MimeType>text/x-hdml</MimeType> + </MimeTypes> + <MediaTypes> + <MediaType name="html"> + <charcterSet value="UTF-8"/> + <title value="HTML"/> + <description value="Rich HTML for HTML 4.0 compliants browsers"/> + <capabilities/> + <mimeTypes>text/html</mimeTypes> + </MediaType> + <MediaType name="vxml"> + <charcterSet value="UTF-8"/> + <title value="VoiceXML"/> + <description value="Format suitable for use with an audio VoiceXML server"/> + <capabilities/> + <mimeTypes>text/vxml</mimeTypes> + </MediaType> + <MediaType name="wml"> + <charcterSet value="UTF-8"/> + <title value="WML"/> + <description value="Format for mobile phones and PDAs compatible with WML 1.1"/> + <capabilities/> + <mimeTypes>text/vnd.wap.wml</mimeTypes> + </MediaType> + <MediaType name="docomo-html"> + <charcterSet value="Shift_JIS"/> + <title value="DOCOMO1"/> + <description value="HTML for i-mode"/> + <capabilities/> + <mimeTypes>text/html</mimeTypes> + </MediaType> + <MediaType name="docomo-wap2"> + <charcterSet value="UTF-8"/> + <title value="DOCOMO2"/> + <description value="XHTML for i-mode"/> + <capabilities/> + <mimeTypes>application/xhtml+xml</mimeTypes> + </MediaType> + <MediaType name="kddi-hdml"> + <charcterSet value="Shift_JIS"/> + <title value="KDDI-HDML"/> + <description value="HDML for ezweb"/> + <capabilities/> + <mimeTypes>text/x-hdml</mimeTypes> + </MediaType> + <MediaType name="kddi-wap2"> + <charcterSet value="Shift_JIS"/> + <title value="KDDI-WAP2"/> + <description value="WAP 2.0 for ezweb"/> + <capabilities/> + <mimeTypes>application/xhtml+xml</mimeTypes> + </MediaType> + <MediaType name="softbank-html"> + <charcterSet value="Shift_JIS"/> + <title value="SOFTBANK-HTML"/> + <description value="HTML for Softbank phone"/> + <capabilities/> + <mimeTypes>text/html</mimeTypes> + </MediaType> + <MediaType name="softbank-wap2"> + <charcterSet value="UTF-8"/> + <title value="SOFTBANK-WAP2"/> + <description value="XHTML for Softbank phone"/> + <capabilities/> + <mimeTypes>application/xhtml+xml</mimeTypes> + </MediaType> + <MediaType name="xhtml-basic"> + <charcterSet value="UTF-8"/> + <title value="XHTML"/> + <description value="XHTML Basic"/> + <capabilities/> + <mimeTypes>application/xhtml+xml</mimeTypes> + </MediaType> + <MediaType name="xml"> + <charcterSet value=""/> + <title value="XML"/> + <description value="XML 1.0"/> + <capabilities/> + <mimeTypes>text/xml</mimeTypes> + </MediaType> + </MediaTypes> + <Capabilities> + <Capability>HTML_3_2</Capability> + <Capability>HTML_4_0</Capability> + <Capability>HTML_ACTIVEX</Capability> + <Capability>HTML_CSS1</Capability> + <Capability>HTML_CSS2</Capability> + <Capability>HTML_CSSP</Capability> + <Capability>HTML_DOM</Capability> + <Capability>HTML_DOM_1</Capability> + <Capability>HTML_DOM_2</Capability> + <Capability>HTML_DOM_IE</Capability> + <Capability>HTML_DOM_NS4</Capability> + <Capability>HTML_FORM</Capability> + <Capability>HTML_FRAME</Capability> + <Capability>HTML_IFRAME</Capability> + <Capability>HTML_IMAGE</Capability> + <Capability>HTML_JAVA</Capability> + <Capability>HTML_JAVA1_0</Capability> + <Capability>HTML_JAVA1_1</Capability> + <Capability>HTML_JAVA1_2</Capability> + <Capability>HTML_JAVASCRIPT</Capability> + <Capability>HTML_JAVASCRIPT_1_0</Capability> + <Capability>HTML_JAVASCRIPT_1_1</Capability> + <Capability>HTML_JAVASCRIPT_1_2</Capability> + <Capability>HTML_JAVA_JRE</Capability> + <Capability>HTML_JSCRIPT</Capability> + <Capability>HTML_JSCRIPT1_0</Capability> + <Capability>HTML_JSCRIPT1_1</Capability> + <Capability>HTML_JSCRIPT1_2</Capability> + <Capability>HTML_LAYER</Capability> + <Capability>HTML_NESTED_TABLE</Capability> + <Capability>HTML_PLUGIN</Capability> + <Capability>HTML_TABLE</Capability> + <Capability>HTML_XML</Capability> + <Capability>HTML_XSL</Capability> + <Capability>HTTP_1_1</Capability> + <Capability>HTTP_COOKIE</Capability> + <Capability>WML_1_0</Capability> + <Capability>WML_1_1</Capability> + <Capability>WML_TABLE</Capability> + <Capability>XML_XINCLUDE</Capability> + <Capability>XML_XPATH</Capability> + <Capability>XML_XSLT</Capability> + </Capabilities> + <Clients> + <Client name="ie5mac" evalOrder="1" preferredMimeTypeID="text/html"> + <userAgentPattern value=".*MSIE 5.*Mac.*"/> + <version value="5.*"/> + <model value="None"/> + <manufacturer value="Microsoft"/> + <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_PLUGIN,HTML_CSS1,HTML_DOM_NS4,HTTP_COOKIE</capabilities> + <mimeTypes>text/html</mimeTypes> + </Client> + <Client name="safari" evalOrder="2" preferredMimeTypeID="text/html"> + <userAgentPattern value=".*Mac.*Safari.*"/> + <version value="5.*"/> + <model value="None"/> + <manufacturer value="Apple"/> + <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities> + <mimeTypes>text/html,text/xml,text/xhtml</mimeTypes> + </Client> + <Client name="ie6" evalOrder="3" preferredMimeTypeID="text/html"> + <userAgentPattern value=".*MSIE 6.*"/> + <version value="6.0"/> + <model value="None"/> + <manufacturer value="Microsoft"/> + <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities> + <mimeTypes>text/html,text/xml,text/xhtml</mimeTypes> + </Client> + <Client name="ie5" evalOrder="4" preferredMimeTypeID="text/html"> + <userAgentPattern value=".*MSIE 5.*"/> + <version value="5.5"/> + <model value="None"/> + <manufacturer value="Microsoft"/> + <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_ACTIVEX,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_IFRAME,HTML_DOM_IE,HTTP_COOKIE</capabilities> + <mimeTypes>text/html,text/xml</mimeTypes> + </Client> + <Client name="ns4" evalOrder="5" preferredMimeTypeID="text/html"> + <userAgentPattern value=".*Mozilla/4.*"/> + <version value="4.75"/> + <model value="None"/> + <manufacturer value="Netscape"/> + <capabilities>HTML_3_2,HTML_JAVA,HTML_JAVASCRIPT,HTML_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_CSS1,HTML_LAYER,HTML_PLUGIN,HTML_DOM_NS4,HTTP_COOKIE</capabilities> + <mimeTypes>text/html</mimeTypes> + </Client> + <Client name="mozilla" evalOrder="6" preferredMimeTypeID="text/html"> + <userAgentPattern value=".*Mozilla/5.*"/> + <version value="1.x"/> + <model value="Mozilla"/> + <manufacturer value="Mozilla"/> + <capabilities>HTML_3_2,HTML_4_0,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IFRAME,HTML_IMAGE,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTML_PLUGIN,HTTP_COOKIE</capabilities> + <mimeTypes>text/html,text/xhtml,text/xml</mimeTypes> + </Client> + <Client name="lynx" evalOrder="7" preferredMimeTypeID="text/html"> + <userAgentPattern value="Lynx.*"/> + <version value=""/> + <model value="None"/> + <manufacturer value="GNU"/> + <capabilities>HTML_TABLE,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTTP_COOKIE</capabilities> + <mimeTypes>text/html</mimeTypes> + </Client> + <Client name="docomo-html" evalOrder="8" preferredMimeTypeID="text/html"> + <userAgentPattern value="DoCoMo/1.0.*"/> + <version value="1.0"/> + <model value="Generic"/> + <manufacturer value="WAP"/> + <capabilities/> + <mimeTypes>text/html</mimeTypes> + </Client> + <Client name="docomo-wap2" evalOrder="9" preferredMimeTypeID="application/xhtml+xml"> + <userAgentPattern value="DoCoMo/2.0.*"/> + <version value="2.0"/> + <model value="Generic"/> + <manufacturer value="WAP"/> + <capabilities/> + <mimeTypes>application/xhtml+xml</mimeTypes> + </Client> + <Client name="kddi-hdml" evalOrder="10" preferredMimeTypeID="text/x-hdml"> + <userAgentPattern value="UP.Browser.*"/> + <version value="1.0"/> + <model value="Generic"/> + <manufacturer value="WAP"/> + <capabilities/> + <mimeTypes>text/x-hdml</mimeTypes> + </Client> + <Client name="kddi-wap2" evalOrder="11" preferredMimeTypeID="application/xhtml+xml"> + <userAgentPattern value="KDDI-.*UP.Browser.*"/> + <version value="2.0"/> + <model value="Generic"/> + <manufacturer value="WAP"/> + <capabilities/> + <mimeTypes>application/xhtml+xml</mimeTypes> + </Client> + <Client name="softbank-html" evalOrder="12" preferredMimeTypeID="text/html"> + <userAgentPattern value="J-PHONE.*"/> + <version value="1.0"/> + <model value="Generic"/> + <manufacturer value="WAP"/> + <capabilities/> + <mimeTypes>text/html</mimeTypes> + </Client> + <Client name="softbank-wap2" evalOrder="13" preferredMimeTypeID="application/xhtml+xml"> + <userAgentPattern value="MOT-C980.*|MOT-V980.*|Vodafone.*|SoftBank.*"/> + <version value="2.0"/> + <model value="Generic"/> + <manufacturer value="WAP"/> + <capabilities/> + <mimeTypes>application/xhtml+xml</mimeTypes> + </Client> + <Client name="vxml_generic" evalOrder="14" preferredMimeTypeID="text/vxml"> + <userAgentPattern value=".*VoiceXML.*"/> + <version value=""/> + <model value="Generic"/> + <manufacturer value="Generic"/> + <capabilities/> + <mimeTypes>text/vxml</mimeTypes> + </Client> + <Client name="nuance" evalOrder="16" preferredMimeTypeID="text/vxml"> + <userAgentPattern value="Nuance.*"/> + <version value=""/> + <model value="Generic"/> + <manufacturer value="Nuance"/> + <capabilities/> + <mimeTypes>text/vxml</mimeTypes> + </Client> + <Client name="agentxml" evalOrder="17" preferredMimeTypeID="text/xml"> + <userAgentPattern value="agentxml/1.0.*"/> + <version value=""/> + <model value="Generic"/> + <manufacturer value="Unknown"/> + <capabilities/> + <mimeTypes>text/xml</mimeTypes> + </Client> + <Client name="opera7" evalOrder="18" preferredMimeTypeID="text/html"> + <userAgentPattern value=".*Opera/7.*"/> + <version value="7.x"/> + <model value="Opera7"/> + <manufacturer value="Opera"/> + <capabilities>HTML_3_2,HTML_4_0,HTML_TABLE,HTML_JAVA,HTML_JAVA_JRE,HTML_JAVASCRIPT,HTML_NESTED_TABLE,HTML_FORM,HTML_FRAME,HTML_IMAGE,HTML_IFRAME,HTML_CSS1,HTML_CSS2,HTML_CSSP,HTML_DOM_1,HTTP_COOKIE,HTML_PLUGIN</capabilities> + <mimeTypes>text/html,text/xml,text/xhtml</mimeTypes> + </Client> + </Clients> + <Roles> + <Role>admin</Role> + <Role>siteadmin</Role> + <Role>guest</Role> + <Role>user</Role> + </Roles> + <Groups> </Groups> - <Users> - <User name="admin"> - <credentials password="##ADMIN_PASSWORD##" enabled="TRUE" requiresUpdate="TRUE"/> - <roles>user,admin</roles> - <groups></groups> - <userinfo> - <preference> - <name value="user.name.given"/> - <value value="System"/> - </preference> - <preference> - <name value="user.name.family"/> - <value value="Administrator"/> - </preference> - </userinfo> - <Rules/> - </User> - <User name="guest"> - <Null/> - <roles>guest,site</roles> - <groups></groups> - <preferences/> - <userinfo/> - <Rules> - <Rule locator="page" rule="site"/> - </Rules> - </User> - <User name="site"> - <credentials password="##SITE_PASSWORD##" enabled="TRUE" requiresUpdate="FALSE"/> - <roles>site,siteadmin</roles> - <groups></groups> - <preferences/> - <userinfo/> - <Rules> - <Rule locator="page" rule="site"/> - </Rules> - </User> - </Users> - <Permissions> - <Permission type="folder" resource="/" actions="view"> - <roles>user,guest</roles> - <groups></groups> - <users></users> - </Permission> - <Permission type="folder" resource="/*" actions="view"> - <roles>user</roles> - <groups></groups> - <users></users> - </Permission> - <Permission type="folder" resource="<<ALL FILES>>" actions="view, edit"> - <roles>admin</roles> - <groups></groups> - <users></users> - </Permission> - <Permission type="portal" resource="jetspeed-layouts::*" actions="view, edit"> - <roles>user</roles> - <groups></groups> - <users></users> - </Permission> - </Permissions> - <ProfilingRules> - <ProfilingRule id="group-fallback" standardRule="false"> - <description value="A role based fallback algorithm based on Jetspeed-1 group-based fallback"/> - <Criteria> - <Criterion name="group"> - <type value="group"/> - <fallBackOrder value="0"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="page"> - <type value="path.session"/> - <value value="default-page"/> - <fallBackOrder value="1"/> - <fallBackType value="0"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="ip-address" standardRule="true"> - <description value="Resolves pages based on the clients remote IP address."/> - <Criteria> - <Criterion name="ip"> - <type value="ip"/> - <fallBackOrder value="0"/> - <fallBackType value="0"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="j1" standardRule="false"> - <description value="The default profiling rule following the Jetspeed-1 hard-coded profiler fallback algorithm."/> - <Criteria> - <Criterion name="page"> - <type value="path.session"/> - <value value="default-page"/> - <fallBackOrder value="0"/> - <fallBackType value="0"/> - </Criterion> - <Criterion name="user"> - <type value="group.role.user"/> - <fallBackOrder value="1"/> - <fallBackType value="0"/> - </Criterion> - <Criterion name="mediatype"> - <type value="mediatype"/> - <fallBackOrder value="2"/> - <fallBackType value="1"/> - </Criterion> - <Criterion name="language"> - <type value="language"/> - <fallBackOrder value="3"/> - <fallBackType value="1"/> - </Criterion> - <Criterion name="country"> - <type value="country"/> - <fallBackOrder value="4"/> - <fallBackType value="1"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="default" standardRule="false"> - <description value="The default profiling rule."/> - <Criteria> - <Criterion name="user"> - <type value="user"/> - <fallBackOrder value="1"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="mediatype"> - <type value="mediatype"/> - <fallBackOrder value="2"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="language"> - <type value="language"/> - <fallBackOrder value="3"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="country"> - <type value="country"/> - <fallBackOrder value="4"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="navigation1"> - <type value="navigation"/> - <value value="/"/> - <fallBackOrder value="5"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="role"> - <type value="role"/> - <fallBackOrder value="6"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="mediatype"> - <type value="mediatype"/> - <fallBackOrder value="7"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="language"> - <type value="language"/> - <fallBackOrder value="8"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="country"> - <type value="country"/> - <fallBackOrder value="9"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="navigation2"> - <type value="navigation"/> - <value value="/"/> - <fallBackOrder value="10"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="group"> - <type value="group"/> - <fallBackOrder value="11"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="mediatype"> - <type value="mediatype"/> - <fallBackOrder value="12"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="language"> - <type value="language"/> - <fallBackOrder value="13"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="country"> - <type value="country"/> - <fallBackOrder value="14"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="page"> - <type value="path.session"/> - <value value="default-page"/> - <fallBackOrder value="0"/> - <fallBackType value="0"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="j2" standardRule="false"> - <description value="The default profiling rule for users and mediatype minus language and country."/> - <Criteria> - <Criterion name="page"> - <type value="path.session"/> - <value value="default-page"/> - <fallBackOrder value="0"/> - <fallBackType value="0"/> - </Criterion> - <Criterion name="user"> - <type value="group.role.user"/> - <fallBackOrder value="1"/> - <fallBackType value="0"/> - </Criterion> - <Criterion name="mediatype"> - <type value="mediatype"/> - <fallBackOrder value="2"/> - <fallBackType value="1"/> - </Criterion> - <Criterion name="language"> - <type value="language"/> - <fallBackOrder value="3"/> - <fallBackType value="1"/> - </Criterion> - <Criterion name="country"> - <type value="country"/> - <fallBackOrder value="4"/> - <fallBackType value="1"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="path" standardRule="true"> - <description value="use a path to locate."/> - <Criteria> - <Criterion name="path"> - <type value="path"/> - <value value="/"/> - <fallBackOrder value="0"/> - <fallBackType value="0"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="role-fallback" standardRule="false"> - <description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/> - <Criteria> - <Criterion name="role"> - <type value="role"/> - <fallBackOrder value="0"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="page"> - <type value="path.session"/> - <value value="default-page"/> - <fallBackOrder value="1"/> - <fallBackType value="0"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="role-group" standardRule="false"> - <description value="A role based fallback algorithm that searches all groups and roles for a user"/> - <Criteria> - <Criterion name="role"> - <type value="role"/> - <fallBackOrder value="0"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="navigation"> - <type value="navigation"/> - <value value="/"/> - <fallBackOrder value="1"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="group"> - <type value="group"/> - <fallBackOrder value="2"/> - <fallBackType value="2"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="security" standardRule="true"> - <description value="The security profiling rule needed for credential change requirements."/> - <Criteria> - <Criterion name="page"> - <type value="hard.coded"/> - <value value="/my-account.psml"/> - <fallBackOrder value="0"/> - <fallBackType value="0"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="user-role-fallback" standardRule="false"> - <description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/> - <Criteria> - <Criterion name="user"> - <type value="user"/> - <fallBackOrder value="0"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="navigation"> - <type value="navigation"/> - <value value="/"/> - <fallBackOrder value="1"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="role"> - <type value="role"/> - <fallBackOrder value="2"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="page"> - <type value="path.session"/> - <value value="default-page"/> - <fallBackOrder value="3"/> - <fallBackType value="1"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="user-rolecombo-fallback" standardRule="false"> - <description value="A role based fallback algorithm based on Jetspeed-1 role-based fallback"/> - <Criteria> - <Criterion name="user"> - <type value="user"/> - <fallBackOrder value="0"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="navigation"> - <type value="navigation"/> - <value value="/"/> - <fallBackOrder value="1"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="role"> - <type value="rolecombo"/> - <fallBackOrder value="2"/> - <fallBackType value="2"/> - </Criterion> - <Criterion name="page"> - <type value="path.session"/> - <value value="default-page"/> - <fallBackOrder value="3"/> - <fallBackType value="1"/> - </Criterion> - </Criteria> - </ProfilingRule> - <ProfilingRule id="site" standardRule="false"> - <description value="A role based fallback algorithm for editing site"/> - <Criteria> - <Criterion name="page"> - <type value="path.session"/> - <value value="default-page"/> - <fallBackOrder value="0"/> - <fallBackType value="0"/> - </Criterion> - <Criterion name="role"> - <type value="role"/> - <fallBackOrder value="1"/> - <fallBackType value="0"/> - </Criterion> - <Criterion name="mediatype"> - <type value="mediatype"/> - <fallBackOrder value="2"/> - <fallBackType value="1"/> - </Criterion> - <Criterion name="language"> - <type value="language"/> - <fallBackOrder value="3"/> - <fallBackType value="1"/> - </Criterion> - <Criterion name="country"> - <type value="country"/> - <fallBackOrder value="4"/> - <fallBackType value="1"/> - </Criterion> - </Criteria> - </ProfilingRule> - </ProfilingRules> + <Users> + <User name="admin"> + <credentials password="##ADMIN_PASSWORD##" enabled="TRUE" requiresUpdate="TRUE"/> + <roles>user,admin</roles> + <groups/> + <userinfo> + <preference> + <name value="user.name.given"/> + <value value="System"/> + </preference> + <preference> + <name value="user.name.family"/> + <value value="Administrator"/> + </preference> + </userinfo> + <Rules/> + </User> + <User name="guest"> + <Null/> + <roles>guest</roles> + <groups/> + <preferences/> + <userinfo/> + <Rules> + <Rule locator="page" rule="site"/> + </Rules> + </User> + </Users> + <Permissions> + <Permission type="folder" resource="/" actions="view"> + <roles>user,guest</roles> + <groups/> + <users/> + </Permission> + <Permission type="folder" resource="/*" actions="view"> + <roles>user</roles> + <groups/> + <users/> + </Permission> + <Permission type="folder" resource="<<ALL FILES>>" actions="view, edit"> + <roles>admin</roles> + <groups/> + <users/> + </Permission> + <Permission type="portal" resource="jetspeed-layouts::*" actions="view, edit"> + <roles>user</roles> + <groups/> + <users/> + </Permission> + </Permissions> + <ProfilingRules> + <ProfilingRule id="default" standardRule="false"> + <description value="The default profiling rule. The path is [user|role|group]/mediatype/language/country/."/> + <Criteria> + <Criterion name="user"> + <type value="user"/> + <fallBackOrder value="1"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="mediatype"> + <type value="mediatype"/> + <fallBackOrder value="2"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="language"> + <type value="language"/> + <fallBackOrder value="3"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="country"> + <type value="country"/> + <fallBackOrder value="4"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="navigation1"> + <type value="navigation"/> + <value value="/"/> + <fallBackOrder value="5"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="role"> + <type value="role"/> + <fallBackOrder value="6"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="mediatype"> + <type value="mediatype"/> + <fallBackOrder value="7"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="language"> + <type value="language"/> + <fallBackOrder value="8"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="country"> + <type value="country"/> + <fallBackOrder value="9"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="navigation2"> + <type value="navigation"/> + <value value="/"/> + <fallBackOrder value="10"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="group"> + <type value="group"/> + <fallBackOrder value="11"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="mediatype"> + <type value="mediatype"/> + <fallBackOrder value="12"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="language"> + <type value="language"/> + <fallBackOrder value="13"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="country"> + <type value="country"/> + <fallBackOrder value="14"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="page"> + <type value="path"/> + <value value="default-page"/> + <fallBackOrder value="0"/> + <fallBackType value="0"/> + </Criterion> + </Criteria> + </ProfilingRule> + <ProfilingRule id="path" standardRule="true"> + <description value="Use a path to locate."/> + <Criteria> + <Criterion name="path"> + <type value="path"/> + <value value="/"/> + <fallBackOrder value="0"/> + <fallBackType value="0"/> + </Criterion> + </Criteria> + </ProfilingRule> + <ProfilingRule id="security" standardRule="true"> + <description value="The security profiling rule needed for credential change requirements."/> + <Criteria> + <Criterion name="page"> + <type value="hard.coded"/> + <value value="/my-account.psml"/> + <fallBackOrder value="0"/> + <fallBackType value="0"/> + </Criterion> + </Criteria> + </ProfilingRule> + <ProfilingRule id="site" standardRule="true"> + <description value="A hostname based fallback algorithm for guest."/> + <Criteria> + <Criterion name="navigation"> + <type value="navigation"/> + <value value="subsite-root"/> + <fallBackOrder value="1"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="hostname"> + <type value="hostname"/> + <fallBackOrder value="2"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="mediatype"> + <type value="mediatype"/> + <fallBackOrder value="3"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="language"> + <type value="language"/> + <fallBackOrder value="4"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="country"> + <type value="country"/> + <fallBackOrder value="5"/> + <fallBackType value="2"/> + </Criterion> + <Criterion name="page"> + <type value="path"/> + <value value="default-page"/> + <fallBackOrder value="0"/> + <fallBackType value="0"/> + </Criterion> + </Criteria> + </ProfilingRule> + </ProfilingRules> </Snapshot> Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/_hostname/folder.metadata =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/_hostname/folder.metadata (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/_hostname/folder.metadata 2008-07-31 06:09:27 UTC (rev 1064) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<folder hidden="false"> + <title>TOP + TOP + + Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/default-page.psml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/default-page.psml (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/default-page.psml 2008-07-31 06:09:27 UTC (rev 1064) @@ -0,0 +1,91 @@ + + Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/folder.metadata =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/folder.metadata (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/__subsite-root/folder.metadata 2008-07-31 06:09:27 UTC (rev 1064) @@ -0,0 +1,12 @@ + + Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_group/folder.metadata =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_group/folder.metadata (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_group/folder.metadata 2008-07-31 06:09:27 UTC (rev 1064) @@ -0,0 +1,7 @@ + + Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_role/folder.metadata =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_role/folder.metadata (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_role/folder.metadata 2008-07-31 06:09:27 UTC (rev 1064) @@ -0,0 +1,7 @@ + + Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/default-page.psml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/default-page.psml (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/default-page.psml 2008-07-31 06:09:27 UTC (rev 1064) @@ -0,0 +1,16 @@ + + Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/folder.metadata =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/folder.metadata 2008-07-29 08:52:40 UTC (rev 1063) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/_template/folder.metadata 2008-07-31 06:09:27 UTC (rev 1064) @@ -9,4 +9,5 @@ Folder Folder + default-page.psml Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/folder.metadata =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/folder.metadata (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/_user/folder.metadata 2008-07-31 06:09:27 UTC (rev 1064) @@ -0,0 +1,6 @@ + + Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/default-page.psml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/default-page.psml 2008-07-29 08:52:40 UTC (rev 1063) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/default-page.psml 2008-07-31 06:09:27 UTC (rev 1064) @@ -1,28 +1,19 @@ - - - - Login - - - + - - public-view - Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/folder.metadata =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/folder.metadata 2008-07-29 08:52:40 UTC (rev 1063) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/folder.metadata 2008-07-31 06:09:27 UTC (rev 1064) @@ -1,7 +1,12 @@ - - Root Folder - - public-view - + Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/page.security =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/page.security 2008-07-29 08:52:40 UTC (rev 1063) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/page.security 2008-07-31 06:09:27 UTC (rev 1064) @@ -1,7 +1,6 @@ - - + admin @@ -9,24 +8,21 @@ admin - - + - user, manager + user view, edit - - + siteadmin view, edit - - + * @@ -42,7 +38,7 @@ admin - view, edit + view user @@ -50,8 +46,7 @@ siteadmin - view + view, edit - Deleted: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml 2008-07-29 08:52:40 UTC (rev 1063) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/portlet-selector.psml 2008-07-31 06:09:27 UTC (rev 1064) @@ -1,25 +0,0 @@ - - - Deleted: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/selector.psml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/selector.psml 2008-07-29 08:52:40 UTC (rev 1063) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/selector.psml 2008-07-31 06:09:27 UTC (rev 1064) @@ -1,25 +0,0 @@ - - - Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/site-editor.psml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/site-editor.psml 2008-07-29 08:52:40 UTC (rev 1063) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/pages/system/customizer/site-editor.psml 2008-07-31 06:09:27 UTC (rev 1064) @@ -6,5 +6,5 @@ - ¥µ¥¤¥È¥¨¥Ç¥£¥¿ + ¥µ¥¤¥È¥¨¥Ç¥£¥¿¡¼ From svnnotify ¡÷ sourceforge.jp Thu Jul 31 15:39:54 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 31 Jul 2008 15:39:54 +0900 Subject: [pal-cvs 3331] [1065] passed name when clicking a back button. Message-ID: <1217486394.552849.31854.nullmailer@users.sourceforge.jp> Revision: 1065 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1065 Author: shinsuke Date: 2008-07-31 15:39:54 +0900 (Thu, 31 Jul 2008) Log Message: ----------- passed name when clicking a back button. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2008-07-31 06:09:27 UTC (rev 1064) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeConfirmPage.java 2008-07-31 06:39:54 UTC (rev 1065) @@ -64,6 +64,11 @@ return null; } + public Class doBack() { + setCrudType(CrudType.READ); + return UserAttributeListPage.class; + } + @TakeOver(type = TakeOverType.INCLUDE, properties = "name") public Class doUpdate() { @@ -120,8 +125,8 @@ * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setKey(java.lang.String) */ @Override - @Required - @Length(maximum = 255) + @Required(target = "doConfirm") + @Length(maximum = 255, target = "doConfirm") public void setKey(String key) { super.setKey(key); } @@ -130,12 +135,12 @@ * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setValue(java.lang.String) */ @Override - @Length(maximum = 255) + @Length(maximum = 255, target = "doConfirm") public void setValue(String value) { super.setValue(value); } - public String getJumpUserAttributeListValue() { + public String getDoBackValue() { return getLabelHelper().getLabelValue("back"); } Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2008-07-31 06:09:27 UTC (rev 1064) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserAttributeEditPage.java 2008-07-31 06:39:54 UTC (rev 1065) @@ -61,16 +61,20 @@ return null; } - // public Class doBack() { - // setCrudType(CrudType.READ); - // return UserAttributeListPage.class; - // } + public Class doBack() { + setCrudType(CrudType.READ); + return UserAttributeListPage.class; + } - public String getJumpUserAttributeListValue() { + public Class doConfirm() { + return UserAttributeConfirmPage.class; + } + + public String getDoBackValue() { return getLabelHelper().getLabelValue("back"); } - public String getGoUserAttributeConfirmValue() { + public String getDoConfirmValue() { return getLabelHelper().getLabelValue("confirm"); } @@ -78,8 +82,8 @@ * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setKey(java.lang.String) */ @Override - @Required - @Length(maximum = 255) + @Required(target = "doConfirm") + @Length(maximum = 255, target = "doConfirm") public void setKey(String key) { super.setKey(key); } @@ -88,7 +92,7 @@ * @see jp.sf.pal.admin.web.user.AbstractUserAttributePage#setValue(java.lang.String) */ @Override - @Length(maximum = 255) + @Length(maximum = 255, target = "doConfirm") public void setValue(String value) { super.setValue(value); } Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2008-07-31 06:09:27 UTC (rev 1064) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeConfirm.html 2008-07-31 06:39:54 UTC (rev 1065) @@ -57,7 +57,7 @@
-
Modified: pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2008-07-31 06:09:27 UTC (rev 1064) +++ pal-admin/trunk/src/main/webapp/view/user/userAttributeEdit.html 2008-07-31 06:39:54 UTC (rev 1065) @@ -60,10 +60,10 @@
-
-
From svnnotify ¡÷ sourceforge.jp Thu Jul 31 15:42:59 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 31 Jul 2008 15:42:59 +0900 Subject: [pal-cvs 3332] [1066] code format. Message-ID: <1217486579.626314.2482.nullmailer@users.sourceforge.jp> Revision: 1066 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1066 Author: shinsuke Date: 2008-07-31 15:42:59 +0900 (Thu, 31 Jul 2008) Log Message: ----------- code format. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/SecurityDefinition.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/SecurityDefinition.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/SecurityDefinition.java 2008-07-31 06:39:54 UTC (rev 1065) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/entity/SecurityDefinition.java 2008-07-31 06:42:59 UTC (rev 1066) @@ -7,10 +7,12 @@ private static final long serialVersionUID = 7981619786238228721L; private String definitionName; -public String getDefinitionName() { - return definitionName; + + public String getDefinitionName() { + return definitionName; + } + + public void setDefinitionName(String definitionName) { + this.definitionName = definitionName; + } } -public void setDefinitionName(String definitionName) { - this.definitionName = definitionName; -} -} Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java 2008-07-31 06:39:54 UTC (rev 1065) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/ProfilingRuleLogic.java 2008-07-31 06:42:59 UTC (rev 1066) @@ -12,7 +12,6 @@ import jp.sf.pal.common.CommonException; import org.apache.jetspeed.profiler.Profiler; -import org.apache.jetspeed.profiler.ProfilerException; import org.seasar.framework.log.Logger; public class ProfilingRuleLogic implements Serializable { Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2008-07-31 06:39:54 UTC (rev 1065) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2008-07-31 06:42:59 UTC (rev 1066) @@ -35,9 +35,7 @@ import org.apache.jetspeed.JetspeedActions; import org.apache.jetspeed.PortalReservedParameters; import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent; -import org.apache.jetspeed.components.portletentity.PortletEntityNotStoredException; import org.apache.jetspeed.components.portletregistry.PortletRegistry; -import org.apache.jetspeed.container.window.FailedToRetrievePortletWindow; import org.apache.jetspeed.container.window.PortletWindowAccessor; import org.apache.jetspeed.decoration.DecorationFactory; import org.apache.jetspeed.decoration.LayoutInfo; @@ -48,8 +46,6 @@ import org.apache.jetspeed.om.common.portlet.MutablePortletApplication; import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite; import org.apache.jetspeed.om.folder.Folder; -import org.apache.jetspeed.om.folder.FolderNotFoundException; -import org.apache.jetspeed.om.folder.InvalidFolderException; import org.apache.jetspeed.om.page.ContentFragment; import org.apache.jetspeed.om.page.ContentPage; import org.apache.jetspeed.om.page.Fragment; @@ -58,15 +54,10 @@ import org.apache.jetspeed.om.page.PageSecurity; import org.apache.jetspeed.om.page.SecurityConstraintsDef; import org.apache.jetspeed.om.preference.FragmentPreference; -import org.apache.jetspeed.page.FolderNotUpdatedException; import org.apache.jetspeed.page.PageManager; -import org.apache.jetspeed.page.PageNotFoundException; -import org.apache.jetspeed.page.PageNotUpdatedException; import org.apache.jetspeed.page.document.DocumentException; -import org.apache.jetspeed.page.document.DocumentNotFoundException; import org.apache.jetspeed.page.document.Node; import org.apache.jetspeed.page.document.NodeException; -import org.apache.jetspeed.page.document.UnsupportedDocumentTypeException; import org.apache.jetspeed.profiler.Profiler; import org.apache.jetspeed.request.RequestContext; import org.apache.jetspeed.security.PermissionManager; Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java 2008-07-31 06:39:54 UTC (rev 1065) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/util/UserRegistrationUtil.java 2008-07-31 06:42:59 UTC (rev 1066) @@ -23,10 +23,10 @@ import javax.faces.context.FacesContext; +import jp.sf.pal.admin.PALAdminConstants; + import org.apache.jetspeed.locator.JetspeedTemplateLocator; -import jp.sf.pal.admin.PALAdminConstants; - public class UserRegistrationUtil { private static FacesContext getFacesContext() { return FacesContext.getCurrentInstance(); From svnnotify ¡÷ sourceforge.jp Thu Jul 31 15:59:32 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 31 Jul 2008 15:59:32 +0900 Subject: [pal-cvs 3333] [1067] clear paging information. Message-ID: <1217487572.161377.14059.nullmailer@users.sourceforge.jp> Revision: 1067 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1067 Author: shinsuke Date: 2008-07-31 15:59:32 +0900 (Thu, 31 Jul 2008) Log Message: ----------- clear paging information. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java 2008-07-31 06:42:59 UTC (rev 1066) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/DefaultPager.java 2008-07-31 06:59:32 UTC (rev 1067) @@ -32,6 +32,12 @@ setLimit(PALAdminConstants.DEFAULT_PAGER_LIMIT_SIZE); } + public void clear() { + setOffset(0); + setCount(0); + setLimit(PALAdminConstants.DEFAULT_PAGER_LIMIT_SIZE); + } + /* (non-Javadoc) * @see jp.sf.pal.admin.pager.Pager#getLimit() */ Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java 2008-07-31 06:42:59 UTC (rev 1066) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/pager/UserPager.java 2008-07-31 06:59:32 UTC (rev 1067) @@ -18,9 +18,7 @@ import java.io.Serializable; public class UserPager extends DefaultPager implements Serializable { - /** - * - */ + private static final long serialVersionUID = 5976446304119300112L; private String filter; @@ -33,6 +31,12 @@ authenticationProviderName = null; } + public void clear() { + super.clear(); + filter = ""; + authenticationProviderName = null; + } + /** * @return the filter */ Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2008-07-31 06:42:59 UTC (rev 1066) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/user/UserListPage.java 2008-07-31 06:59:32 UTC (rev 1067) @@ -140,12 +140,14 @@ // } public Class doSearch() { + getUserManagementService().getUserPager().clear(); getUserManagementService().updateQuery(this); return null; } public Class doResetSearch() { setFilter(""); + getUserManagementService().getUserPager().clear(); getUserManagementService().updateQuery(this); return null; } From svnnotify ¡÷ sourceforge.jp Thu Jul 31 16:30:52 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 31 Jul 2008 16:30:52 +0900 Subject: [pal-cvs 3334] [1068] display an entire value. Message-ID: <1217489452.058912.7098.nullmailer@users.sourceforge.jp> Revision: 1068 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1068 Author: shinsuke Date: 2008-07-31 16:30:51 +0900 (Thu, 31 Jul 2008) Log Message: ----------- display an entire value. Modified Paths: -------------- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html -------------- next part -------------- Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2008-07-31 06:59:32 UTC (rev 1067) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPreferenceEditorPage.java 2008-07-31 07:30:51 UTC (rev 1068) @@ -177,7 +177,8 @@ } public String getPreferenceNameForView() { - return StringUtils.abbreviate(preferenceName, MAX_LENGTH_OF_STRING); + return preferenceName; + // return StringUtils.abbreviate(preferenceName, MAX_LENGTH_OF_STRING); } /** @@ -195,8 +196,9 @@ } public String getPreferenceValueForView() { - return StringUtils.abbreviate(StringEscapeUtils - .unescapeXml(preferenceValue), MAX_LENGTH_OF_STRING); + return preferenceValue; + // return StringUtils.abbreviate(StringEscapeUtils + // .unescapeXml(preferenceValue), MAX_LENGTH_OF_STRING); } /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2008-07-31 06:59:32 UTC (rev 1067) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutPropertyEditorPage.java 2008-07-31 07:30:51 UTC (rev 1068) @@ -176,7 +176,8 @@ } public String getPropertyNameForView() { - return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); + return propertyName; + // return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); } /** @@ -194,7 +195,8 @@ } public String getPropertyValueForView() { - return StringUtils.abbreviate(propertyValue, MAX_LENGTH_OF_STRING); + return propertyValue; + // return StringUtils.abbreviate(propertyValue, MAX_LENGTH_OF_STRING); } /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2008-07-31 06:59:32 UTC (rev 1067) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPreferenceEditorPage.java 2008-07-31 07:30:51 UTC (rev 1068) @@ -177,7 +177,8 @@ } public String getPreferenceNameForView() { - return StringUtils.abbreviate(preferenceName, MAX_LENGTH_OF_STRING); + return preferenceName; + // return StringUtils.abbreviate(preferenceName, MAX_LENGTH_OF_STRING); } /** @@ -195,8 +196,9 @@ } public String getPreferenceValueForView() { - return StringUtils.abbreviate(StringEscapeUtils - .unescapeXml(preferenceValue), MAX_LENGTH_OF_STRING); + return preferenceValue; + // return StringUtils.abbreviate(StringEscapeUtils + // .unescapeXml(preferenceValue), MAX_LENGTH_OF_STRING); } /** Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java =================================================================== --- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2008-07-31 06:59:32 UTC (rev 1067) +++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletPropertyEditorPage.java 2008-07-31 07:30:51 UTC (rev 1068) @@ -176,7 +176,8 @@ } public String getPropertyNameForView() { - return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); + return propertyName; + // return StringUtils.abbreviate(propertyName, MAX_LENGTH_OF_STRING); } /** @@ -194,7 +195,8 @@ } public String getPropertyValueForView() { - return StringUtils.abbreviate(propertyValue, MAX_LENGTH_OF_STRING); + return propertyValue; + // return StringUtils.abbreviate(propertyValue, MAX_LENGTH_OF_STRING); } /** Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html =================================================================== --- pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2008-07-31 06:59:32 UTC (rev 1067) +++ pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2008-07-31 07:30:51 UTC (rev 1068) @@ -78,8 +78,8 @@
NVNV
NVNV
NVNV
NVNV
From svnnotify ¡÷ sourceforge.jp Thu Jul 31 22:52:54 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 31 Jul 2008 22:52:54 +0900 Subject: [pal-cvs 3335] [1069] criterion order problem when using derby.. Message-ID: <1217512374.913697.24214.nullmailer@users.sourceforge.jp> Revision: 1069 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1069 Author: shinsuke Date: 2008-07-31 22:52:54 +0900 (Thu, 31 Jul 2008) Log Message: ----------- criterion order problem when using derby.. this is a workaround fix. needs to fix the root cause.portal/files/etc/sql/min/j2-seed.xml Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-07-31 07:30:51 UTC (rev 1068) +++ pal-portal/branches/pal-portal-1.x/portal/files/etc/sql/min/j2-seed.xml 2008-07-31 13:52:54 UTC (rev 1069) @@ -352,6 +352,12 @@ + + + + + + @@ -424,12 +430,6 @@ - - - - - - @@ -457,6 +457,12 @@ + + + + + + @@ -483,12 +489,6 @@ - - - - - - From svnnotify ¡÷ sourceforge.jp Thu Jul 31 22:54:20 2008 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 31 Jul 2008 22:54:20 +0900 Subject: [pal-cvs 3336] [1070] backport derby class from 1.0.4. Message-ID: <1217512460.004642.25376.nullmailer@users.sourceforge.jp> Revision: 1070 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1070 Author: shinsuke Date: 2008-07-31 22:54:19 +0900 (Thu, 31 Jul 2008) Log Message: ----------- backport derby class from 1.0.4. Added Paths: ----------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/ojb/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/ojb/broker/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/ojb/broker/platforms/ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/ojb/broker/platforms/PlatformDerbyImpl.java -------------- next part -------------- Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/ojb/broker/platforms/PlatformDerbyImpl.java =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/ojb/broker/platforms/PlatformDerbyImpl.java (rev 0) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/ojb/broker/platforms/PlatformDerbyImpl.java 2008-07-31 13:54:19 UTC (rev 1070) @@ -0,0 +1,86 @@ +package org.apache.ojb.broker.platforms; + +/* Copyright 2002-2005 The Apache Software Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Types; + +/** + * This class defines specific behavior for the Derby platform. + */ +public class PlatformDerbyImpl extends PlatformDefaultImpl +{ + + /** + * {@inheritDoc} + */ + public byte getJoinSyntaxType() + { + return SQL92_NOPAREN_JOIN_SYNTAX; + } + + /** + * {@inheritDoc} + */ + public boolean supportsMultiColumnCountDistinct() + { + // Currently Derby supports COUNT DISTINCT only for one column + return false; + } + + /** + * {@inheritDoc} + */ + public void setObjectForStatement(PreparedStatement ps, int index, + Object value, int jdbcType) throws SQLException + { + if (((jdbcType == Types.CHAR) || (jdbcType == Types.VARCHAR)) + && (value instanceof Character)) + { + // [tomdz] + // Currently, Derby doesn't like Character objects in the + // PreparedStatement + // when using PreparedStatement#setObject(index, value, jdbcType) + // method + // (see issue DERBY-773) + // So we make a String object out of the Character object and use + // that instead + super.setObjectForStatement(ps, index, value.toString(), jdbcType); + } + else + { + super.setObjectForStatement(ps, index, value, jdbcType); + } + } + + /** + * {@inheritDoc} + */ + public String getLastInsertIdentityQuery(String tableName) + { + // matthias.roth ¡÷ impart.ch + // the function is used by the + // org.apache.ojb.broker.util.sequence.SequenceManagerNativeImpl + // this call must be made before commit the insert command, so you + // must turn off autocommit by seting the useAutoCommit="2" + // or use useAutoCommit="1" or use a connection with autoCommit set + // false + // by default (e.g. in managed environments) + // transaction demarcation is mandatory + return "values IDENTITY_VAL_LOCAL()"; + } +} Property changes on: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/components/portal/src/java/org/apache/ojb/broker/platforms/PlatformDerbyImpl.java ___________________________________________________________________ Name: svn:eol-style + native