edalquist

public class SomeEntity {
    @NaturalId
    @ManyToOne(optional = false)
    private final StylesheetDescriptorImpl stylesheetDescriptor;
    
    @NaturalId
    private final int userId;
    
    @NaturalId
    private final int profileId;

edalquist

interface EntityLoadAccess<T> {
    public T getReferenceById(Object id);
    public T getReferenceById(Object id, LockOptions lockOptions);
    public NaturalIdQueryBuilder getNaturalIdQueryBuilder();
    public T loadById(Object id);
    public T loadById(Object id, LockOptions lockOptions);
}

public interface NaturalIdQueryBuilder<T> {
    public <V> NaturalIdQueryBuilder<T> setNaturalIdParam(Attribute<T, V> attribute, V value);

edalquist

public class RemoteUserNexusSecureHttpAuthenticationFilter extends NexusSecureHttpAuthenticationFilter {

    /* (non-Javadoc)
     * @see org.apache.shiro.web.filter.authc.AuthenticatingFilter#createToken(java.lang.String, java.lang.String, javax.servlet.ServletRequest, javax.servlet.ServletResponse)
     */
    @Override
    protected AuthenticationToken createToken(String username, String password, ServletRequest request, ServletResponse response) {
        final HttpServletRequest httpServletRequest = (HttpServletRequest)request;
        
        final String remoteUser = httpServletRequest.getRemoteUser();

edalquist

Index: persistenceContext.xml
===================================================================
--- persistenceContext.xml	(revision 25216)
+++ persistenceContext.xml	(working copy)
@@ -41,14 +41,19 @@
     <aop:config>
         <aop:pointcut id="jpaDaoExecution" 
             expression="execution(* org.jasig.portal.*.dao.jpa.Jpa*Dao.*(..))"/>
+        <aop:pointcut id="prefsStoreExecution" 
+            expression="execution(* org.jasig.portal.portlet.container.services.PortletPreferencesServiceImpl.*(..))"/>

edalquist

public class MyBean {
    private Object foo;
    private Object bar;
    
    public MyBean() {
    }
    
    private MyBean(MyBean myBean) {
        this.setFoo(myBean.getBar());
        this.setBar(myBean.getBar());

edalquist

<userRoleMapping>
<userId>dalquist</userId>
<source>RUT</source>
<roles>
<role>edu.wisc.my.portal Deployer</role>
</roles>
</userRoleMapping> 

edalquist

apollo:uPortal edalquist$ git fetch upstream
remote: Counting objects: 20, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 11 (delta 8), reused 11 (delta 8)
Unpacking objects: 100% (11/11), done.
From github.com:Jasig/uPortal
   570a685..db13c90  master     -> upstream/master
apollo:uPortal edalquist$ git checkout master
Switched to branch 'master'
apollo:uPortal edalquist$ git merge upstream/master

edalquist

/**
 * Copyright (c) 2000-2009, Jasig, Inc.
 * See license distributed with this file and available online at
 * https://www.ja-sig.org/svn/jasig-parent/tags/rel-10/license-header.txt
 */

package org.jasig.stats.reporting.view;

import java.util.Map;

edalquist

select dd.DD_DATE, lea.LOGIN_COUNT, lea.UNIQUE_LOGIN_COUNT
from UP_DATE_DIMENSION dd
	left join UP_LOGIN_EVENT_AGGREGATE lea on 
		dd.DATE_ID = lea.DATE_DIMENSION_ID and lea.INTERVAL='DAY' and lea.AGGREGATED_GROUP_ID = (select agm.ID from UP_AGGREGATE_GROUP_MAPPING agm where agm.GROUP_NAME='Everyone')
where dd.DD_YEAR = 2012 and dd.DD_MONTH=1

edalquist

    protected CriteriaQuery<LoginAggregationImpl> buildFindLoginAggregationsByDateRangeQuery(final CriteriaBuilder cb) {
        final CriteriaQuery<LoginAggregationImpl> criteriaQuery = cb.createQuery(LoginAggregationImpl.class);
        
        final Root<DateDimensionImpl> root = criteriaQuery.from(DateDimensionImpl.class);
        final CollectionJoin<DateDimensionImpl, LoginAggregationImpl> loginAggrJoin = root.join(DateDimensionImpl_.loginAggregations, JoinType.LEFT);
        
        criteriaQuery.select(loginAggrJoin);
        criteriaQuery.where(
                cb.and(
                        cb.between(root.get(DateDimensionImpl_.date), this.startDate, this.endDate),