diff --git a/announcement/announcement-impl/impl/pom.xml b/announcement/announcement-impl/impl/pom.xml index b3f5dee8ab24..6970b83eff86 100644 --- a/announcement/announcement-impl/impl/pom.xml +++ b/announcement/announcement-impl/impl/pom.xml @@ -17,8 +17,11 @@ http://www.sakaiproject.org/ 2003 - jar + sakai-component + + components + org.sakaiproject.kernel diff --git a/announcement/announcement-impl/pack/src/webapp/WEB-INF/components.xml b/announcement/announcement-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from announcement/announcement-impl/pack/src/webapp/WEB-INF/components.xml rename to announcement/announcement-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/announcement/announcement-impl/pack/pom.xml b/announcement/announcement-impl/pack/pom.xml deleted file mode 100644 index e8a29001bac0..000000000000 --- a/announcement/announcement-impl/pack/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.announcement - announcement - 12-SNAPSHOT - ../../pom.xml - - - sakai-announcement-pack - org.sakaiproject.announcement - sakai-announcement-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-announcement-impl - - - xerces - xmlParserAPIs - 2.6.2 - jar - runtime - - - xerces - xercesImpl - 2.6.2 - jar - runtime - - - diff --git a/announcement/pom.xml b/announcement/pom.xml index 87ccbdf1315a..c14c50a99c18 100644 --- a/announcement/pom.xml +++ b/announcement/pom.xml @@ -16,7 +16,6 @@ announcement-api/api announcement-impl/impl - announcement-impl/pack announcement-tool/tool diff --git a/archive/import-pack/pom.xml b/archive/import-pack/pom.xml deleted file mode 100644 index ddf635dcb6fd..000000000000 --- a/archive/import-pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - archive-base - org.sakaiproject - 12-SNAPSHOT - ../pom.xml - - Sakai Import Components Package - org.sakaiproject - sakai-anouncement-import - - Sakai Foundation - http://sakaiproject.org/ - - 2005 - sakai-component - - components - - - - org.sakaiproject - sakai-import-announcement - - - - - - - diff --git a/archive/import-pack/src/webapp/WEB-INF/components.xml b/archive/import-pack/src/webapp/WEB-INF/components.xml deleted file mode 100644 index 9556f4ac657e..000000000000 --- a/archive/import-pack/src/webapp/WEB-INF/components.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/archive/pom.xml b/archive/pom.xml index 82bdadc4ae5d..9a20c908fac6 100644 --- a/archive/pom.xml +++ b/archive/pom.xml @@ -14,7 +14,6 @@ archive-tool/tool import-handlers/announcement-handlers - import-pack diff --git a/assignment/assignment-impl/impl/pom.xml b/assignment/assignment-impl/impl/pom.xml index 7bae8a05f1a4..4898c446baaa 100644 --- a/assignment/assignment-impl/impl/pom.xml +++ b/assignment/assignment-impl/impl/pom.xml @@ -17,7 +17,7 @@ http://sakaiproject.org/ 2003 - jar + sakai-component diff --git a/assignment/assignment-impl/pack/src/webapp/WEB-INF/components.xml b/assignment/assignment-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from assignment/assignment-impl/pack/src/webapp/WEB-INF/components.xml rename to assignment/assignment-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/assignment/assignment-impl/pack/pom.xml b/assignment/assignment-impl/pack/pom.xml deleted file mode 100644 index e0665a12f2dd..000000000000 --- a/assignment/assignment-impl/pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.assignment - assignment - 12-SNAPSHOT - ../../pom.xml - - - sakai-assignment-pack - org.sakaiproject.assignment - sakai-assignment-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-assignment-impl - - - diff --git a/assignment/assignment-tool/tool/pom.xml b/assignment/assignment-tool/tool/pom.xml index db9b7babb985..91347e8059e2 100644 --- a/assignment/assignment-tool/tool/pom.xml +++ b/assignment/assignment-tool/tool/pom.xml @@ -40,11 +40,6 @@ ${project.groupId} sakai-assignment-api - - ${project.groupId} - sakai-assignment-impl - ${project.version} - ${project.groupId} sakai-assignment-bundles @@ -117,6 +112,11 @@ org.sakaiproject.scheduler scheduler-api + + org.apache.poi + poi + 3.14 + diff --git a/assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java b/assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java index ea335f08ae63..5d457a29712f 100644 --- a/assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java +++ b/assignment/assignment-tool/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java @@ -21,8 +21,6 @@ import org.sakaiproject.assignment.api.AssignmentContent; import org.sakaiproject.assignment.api.AssignmentService; import org.sakaiproject.assignment.api.AssignmentSubmission; -import org.sakaiproject.assignment.impl.BaseAssignmentService; -import org.sakaiproject.assignment.impl.MySecurityAdvisor; import org.sakaiproject.authz.api.SecurityAdvisor; import org.sakaiproject.authz.api.SecurityService; import org.sakaiproject.component.api.ServerConfigurationService; @@ -484,10 +482,12 @@ public Map getAssignDataForAnnouncement(EntityView view, } try { // enable permission to view possible draft assignment - securityService.pushAdvisor(new MySecurityAdvisor(sessionManager - .getCurrentSessionUserId(), + SecurityAdvisor securityAdvisor = createSecurityAdvisor( + sessionManager.getCurrentSessionUserId(), AssignmentService.SECURE_ADD_ASSIGNMENT, - BaseAssignmentService.getContextReference(context))); + assignmentService.assignmentReference(null, context) + ); + securityService.pushAdvisor(securityAdvisor); Assignment a = assignmentService.getAssignment(assignmentService .assignmentReference(context, assignmentId)); @@ -597,6 +597,15 @@ public Map getAssignDataForAnnouncement(EntityView view, return assignData; } + private SecurityAdvisor createSecurityAdvisor(String currentUserId, String requiredFunction, String requiredReference) { + return (userId, function, reference) -> currentUserId.equals(userId) && + requiredFunction.equals(function) && + requiredReference.equals(reference) + ? SecurityAdvisor.SecurityAdvice.ALLOWED + : SecurityAdvisor.SecurityAdvice.PASS + ; + } + @EntityCustomAction(action = "deepLinkWithPermissions", viewKey = EntityView.VIEW_LIST) public Map getAssignmentDeepLinks(EntityView view, Map params) { @@ -900,11 +909,11 @@ public Map getProperties(String reference) { if (!"null".equals(submissionId)) { props.put("security.assignment.ref", submissionId); - SecurityAdvisor subAdv = new MySecurityAdvisor( + SecurityAdvisor subAdv = createSecurityAdvisor( sessionManager.getCurrentSessionUserId(), AssignmentService.SECURE_ACCESS_ASSIGNMENT_SUBMISSION, submissionId); - SecurityAdvisor subAdv2 = new MySecurityAdvisor( + SecurityAdvisor subAdv2 = createSecurityAdvisor( sessionManager.getCurrentSessionUserId(), AssignmentService.SECURE_GRADE_ASSIGNMENT_SUBMISSION, assignment.getReference()); diff --git a/assignment/pom.xml b/assignment/pom.xml index 9a33ba849dfd..062cd172a8a8 100644 --- a/assignment/pom.xml +++ b/assignment/pom.xml @@ -17,7 +17,6 @@ assignment-api/api assignment-bundles assignment-impl/impl - assignment-impl/pack assignment-tool/tool diff --git a/basiclti/basiclti-blis/pom.xml b/basiclti/basiclti-blis/pom.xml index 17ddc820dc05..b88cd0d7933a 100644 --- a/basiclti/basiclti-blis/pom.xml +++ b/basiclti/basiclti-blis/pom.xml @@ -31,10 +31,6 @@ ${project.groupId} basiclti-api - - ${project.groupId} - basiclti-impl - ${project.groupId} portlet-util @@ -80,6 +76,10 @@ json-simple 1.1 + + commons-lang + commons-lang + diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java b/basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java index c2d78d474033..a9007cd2d841 100644 --- a/basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java +++ b/basiclti/basiclti-blis/src/java/org/sakaiproject/blti/ServiceServlet.java @@ -92,8 +92,6 @@ import org.tsugi.pox.IMSPOXRequest; import org.sakaiproject.lti.api.LTIService; -import org.sakaiproject.util.foorm.SakaiFoorm; -import org.sakaiproject.util.foorm.FoormUtil; /** * Notes: @@ -123,8 +121,6 @@ public class ServiceServlet extends HttpServlet { private static Logger M_log = LoggerFactory.getLogger(ServiceServlet.class); private static ResourceLoader rb = new ResourceLoader("blis"); - protected static SakaiFoorm foorm = new SakaiFoorm(); - protected static LTIService ltiService = null; private final String returnHTML = @@ -506,7 +502,7 @@ protected void processSetting(HttpServletRequest request, HttpServletResponse re } else { Map content = null; String contentStr = pitch.getProperty("contentKey"); - Long contentKey = foorm.getLongKey(contentStr); + Long contentKey = SakaiBLTIUtil.getLongKey(contentStr); if ( contentKey >= 0 ) content = ltiService.getContentDao(contentKey, siteId); if ( content != null ) { if ( "basic-lti-savesetting".equals(lti_message_type) ) { diff --git a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti2/LTI2Service.java b/basiclti/basiclti-blis/src/java/org/sakaiproject/lti2/LTI2Service.java index 5f73df3c4582..7b47d5294dd4 100644 --- a/basiclti/basiclti-blis/src/java/org/sakaiproject/lti2/LTI2Service.java +++ b/basiclti/basiclti-blis/src/java/org/sakaiproject/lti2/LTI2Service.java @@ -56,7 +56,6 @@ import org.sakaiproject.component.cover.ServerConfigurationService; import org.sakaiproject.lti.api.LTIService; import org.sakaiproject.util.ResourceLoader; -import org.sakaiproject.util.foorm.SakaiFoorm; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; @@ -76,8 +75,6 @@ public class LTI2Service extends HttpServlet { private static Logger M_log = LoggerFactory.getLogger(LTI2Service.class); private static ResourceLoader rb = new ResourceLoader("blis"); - protected static SakaiFoorm foorm = new SakaiFoorm(); - protected static LTIService ltiService = null; protected String resourceUrl = null; @@ -231,7 +228,7 @@ protected ToolConsumer getToolConsumerProfile(Map deploy, String // Not yet supported in Sakai // consumer.addCapability(SakaiBLTIUtil.CANVAS_PLACEMENTS_ACCOUNTNAVIGATION); - if ( foorm.getLong(deploy.get(LTIService.LTI_ALLOWCONTENTITEM)) > 0 ) { + if ( SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_ALLOWCONTENTITEM)) > 0 ) { consumer.addCapability(LTI2Messages.CONTENT_ITEM_SELECTION_REQUEST); // Not yet supported in Sakai // consumer.addCapability(SakaiBLTIUtil.SAKAI_CONTENTITEM_SELECTANY); @@ -242,11 +239,11 @@ protected ToolConsumer getToolConsumerProfile(Map deploy, String consumer.addCapability(SakaiBLTIUtil.CANVAS_PLACEMENTS_CONTENTIMPORT); } - if (foorm.getLong(deploy.get(LTIService.LTI_SENDEMAILADDR)) > 0 ) { + if (SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_SENDEMAILADDR)) > 0 ) { consumer.allowEmail(); } - if (foorm.getLong(deploy.get(LTIService.LTI_SENDNAME)) > 0 ) { + if (SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_SENDNAME)) > 0 ) { consumer.allowName(); } @@ -254,7 +251,7 @@ protected ToolConsumer getToolConsumerProfile(Map deploy, String services.add(StandardServices.LTI2Registration(serverUrl + LTI2_PATH + SVC_tc_registration + "/" + profile_id)); String allowOutcomes = ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED, SakaiBLTIUtil.BASICLTI_OUTCOMES_ENABLED_DEFAULT); - if ("true".equals(allowOutcomes) && foorm.getLong(deploy.get(LTIService.LTI_ALLOWOUTCOMES)) > 0 ) { + if ("true".equals(allowOutcomes) && SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_ALLOWOUTCOMES)) > 0 ) { consumer.allowResult(); services.add(LTI2ResultItem); @@ -263,12 +260,12 @@ protected ToolConsumer getToolConsumerProfile(Map deploy, String } String allowRoster = ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_ROSTER_ENABLED, SakaiBLTIUtil.BASICLTI_ROSTER_ENABLED_DEFAULT); - if ("true".equals(allowRoster) && foorm.getLong(deploy.get(LTIService.LTI_ALLOWROSTER)) > 0 ) { + if ("true".equals(allowRoster) && SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_ALLOWROSTER)) > 0 ) { services.add(SakaiLTI2Services.BasicRoster(serverUrl+LTI1_PATH)); } String allowSettings = ServerConfigurationService.getString(SakaiBLTIUtil.BASICLTI_SETTINGS_ENABLED, SakaiBLTIUtil.BASICLTI_SETTINGS_ENABLED_DEFAULT); - if ("true".equals(allowSettings) && foorm.getLong(deploy.get(LTIService.LTI_ALLOWSETTINGS)) > 0 ) { + if ("true".equals(allowSettings) && SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_ALLOWSETTINGS)) > 0 ) { consumer.allowSettings(); services.add(SakaiLTI2Services.BasicSettings(serverUrl+LTI1_PATH)); @@ -298,10 +295,10 @@ public void registerToolProviderProfile(HttpServletRequest request,HttpServletRe response.setStatus(HttpServletResponse.SC_NOT_FOUND); return; } - Long deployKey = foorm.getLong(deploy.get(LTIService.LTI_ID)); + Long deployKey = SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_ID)); // See if we can even register... - Long reg_state = foorm.getLong(deploy.get(LTIService.LTI_REG_STATE)); + Long reg_state = SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_REG_STATE)); String key = null; String secret = null; String new_secret = null; @@ -630,9 +627,9 @@ public void handleSettingsRequest(HttpServletRequest request,HttpServletResponse ltiService.filterContent(content, tool); // Check settings to see if we are allowed to do this - if (foorm.getLong(content.get(LTIService.LTI_ALLOWOUTCOMES)) > 0 || - foorm.getLong(tool.get(LTIService.LTI_ALLOWOUTCOMES)) > 0 ) { - // Good news + if (SakaiBLTIUtil.getLong(content.get(LTIService.LTI_ALLOWOUTCOMES)) > 0 || + SakaiBLTIUtil.getLong(tool.get(LTIService.LTI_ALLOWOUTCOMES)) > 0 ) { + // Good news } else { response.setStatus(HttpServletResponse.SC_FORBIDDEN); doErrorJSON(request,response, jsonRequest, "Item does not allow tool settings", null); @@ -678,7 +675,7 @@ public void handleSettingsRequest(HttpServletRequest request,HttpServletResponse // Check settings to see if we are allowed to do this if ( deploy != null ) { - if (foorm.getLong(deploy.get(LTIService.LTI_ALLOWOUTCOMES)) > 0 ) { + if (SakaiBLTIUtil.getLong(deploy.get(LTIService.LTI_ALLOWOUTCOMES)) > 0 ) { // Good news } else { response.setStatus(HttpServletResponse.SC_FORBIDDEN); diff --git a/basiclti/basiclti-common/pom.xml b/basiclti/basiclti-common/pom.xml index 4053c5537acb..56c6424772ca 100644 --- a/basiclti/basiclti-common/pom.xml +++ b/basiclti/basiclti-common/pom.xml @@ -78,6 +78,10 @@ javax.servlet servlet-api + + commons-lang + commons-lang + diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/util/foorm/Foorm.java b/basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/Foorm.java similarity index 100% rename from basiclti/basiclti-impl/src/java/org/sakaiproject/util/foorm/Foorm.java rename to basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/Foorm.java diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java b/basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java similarity index 94% rename from basiclti/basiclti-impl/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java rename to basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java index 4676b1544603..5dbe084cd5b7 100644 --- a/basiclti/basiclti-impl/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java +++ b/basiclti/basiclti-common/src/java/org/sakaiproject/util/foorm/SakaiFoorm.java @@ -1,13 +1,6 @@ package org.sakaiproject.util.foorm; -import java.util.Properties; -import java.util.Map; -import java.util.HashMap; -import java.util.ArrayList; -import java.util.Arrays; - import java.sql.Connection; -import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; diff --git a/basiclti/basiclti-impl/src/test/org/sakaiproject/util/foorm/FoormTest.java b/basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/FoormTest.java similarity index 99% rename from basiclti/basiclti-impl/src/test/org/sakaiproject/util/foorm/FoormTest.java rename to basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/FoormTest.java index 89942cce73ea..fed4fda31653 100644 --- a/basiclti/basiclti-impl/src/test/org/sakaiproject/util/foorm/FoormTest.java +++ b/basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/FoormTest.java @@ -30,8 +30,6 @@ import java.sql.SQLException; import java.sql.Statement; -import org.sakaiproject.util.foorm.Foorm; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/basiclti/basiclti-impl/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java b/basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java similarity index 98% rename from basiclti/basiclti-impl/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java rename to basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java index 95c661127554..e563f8f9c23b 100644 --- a/basiclti/basiclti-impl/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java +++ b/basiclti/basiclti-common/src/test/org/sakaiproject/util/foorm/TestFoormJUnit.java @@ -29,7 +29,6 @@ import java.lang.Class; import java.math.BigDecimal; -import java.math.BigInteger; import java.sql.Connection; import java.sql.DriverManager; @@ -38,10 +37,6 @@ import java.sql.SQLException; import java.sql.Statement; -import org.sakaiproject.util.foorm.Foorm; - -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.Properties; diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml index 1645492605f2..7674f19242b3 100644 --- a/basiclti/basiclti-impl/pom.xml +++ b/basiclti/basiclti-impl/pom.xml @@ -16,7 +16,11 @@ http://sakaiproject.org/ 2009 - jar + sakai-component + + + components + diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java index 2f52dfdc92c6..7ca1903578d6 100644 --- a/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java +++ b/basiclti/basiclti-impl/src/java/org/sakaiproject/basiclti/impl/BasicLTISecurityServiceImpl.java @@ -30,7 +30,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.ServletOutputStream; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -39,7 +38,6 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.tsugi.basiclti.BasicLTIUtil; import org.sakaiproject.authz.cover.SecurityService; import org.sakaiproject.entity.api.Entity; import org.sakaiproject.entity.api.EntityAccessOverloadException; @@ -69,17 +67,11 @@ import org.sakaiproject.lti.api.LTIExportService.ExportType; import org.sakaiproject.lti.api.LTIService; //import org.sakaiproject.event.cover.EventTrackingService; -import org.sakaiproject.component.cover.ComponentManager; -import org.sakaiproject.util.Validator; -import org.sakaiproject.util.Web; import org.sakaiproject.site.api.SitePage; import org.sakaiproject.site.api.ToolConfiguration; -import org.sakaiproject.util.foorm.SakaiFoorm; - import org.sakaiproject.basiclti.LocalEventTrackingService; import org.sakaiproject.basiclti.util.SakaiBLTIUtil; -import org.sakaiproject.basiclti.impl.BasicLTIArchiveBean; @SuppressWarnings("deprecation") public class BasicLTISecurityServiceImpl implements EntityProducer { @@ -93,8 +85,6 @@ public class BasicLTISecurityServiceImpl implements EntityProducer { public static final String TOOL_REGISTRATION = "sakai.basiclti"; public static final String EVENT_BASICLTI_LAUNCH = "basiclti.launch"; - protected static SakaiFoorm foorm = new SakaiFoorm(); - // Note: security needs a proper Resource reference /******************************************************************************* @@ -293,13 +283,13 @@ public void handleAccess(HttpServletRequest req, HttpServletResponse res, Refere } Map deploy = null; String deployStr = refId.substring(7); - Long deployKey = foorm.getLongKey(deployStr); + Long deployKey = SakaiBLTIUtil.getLongKey(deployStr); if ( deployKey >= 0 ) deploy = ltiService.getDeployDao(deployKey); String placementId = req.getParameter("placement"); // System.out.println("deployStr="+deployStr+" deployKey="+deployKey+" placementId="+placementId); // System.out.println(deploy); - Long reg_state = foorm.getLongKey(deploy.get(LTIService.LTI_REG_STATE)); - if ( reg_state == 0 ) + Long reg_state = SakaiBLTIUtil.getLongKey(deploy.get(LTIService.LTI_REG_STATE)); + if ( reg_state == 0 ) { retval = SakaiBLTIUtil.postRegisterHTML(deployKey, deploy, rb, placementId); } @@ -324,7 +314,7 @@ else if ( refId.startsWith("tool:") && refId.length() > 5 ) if ( value == null ) continue; propData.setProperty(key,value); } - Long toolKey = foorm.getLongKey(toolStr); + Long toolKey = SakaiBLTIUtil.getLongKey(toolStr); if ( toolKey >= 0 ) { tool = ltiService.getToolDao(toolKey, ref.getContext()); @@ -340,7 +330,7 @@ else if ( refId.startsWith("content:") && refId.length() > 8 ) Map tool = null; String contentStr = refId.substring(8); - Long contentKey = foorm.getLongKey(contentStr); + Long contentKey = SakaiBLTIUtil.getLongKey(contentStr); if ( contentKey >= 0 ) { content = ltiService.getContentDao(contentKey,ref.getContext()); @@ -354,7 +344,7 @@ else if ( refId.startsWith("content:") && refId.length() > 8 ) } if ( content != null ) { - Long toolKey = foorm.getLongKey(content.get(LTIService.LTI_TOOL_ID)); + Long toolKey = SakaiBLTIUtil.getLongKey(content.get(LTIService.LTI_TOOL_ID)); if ( toolKey >= 0 ) tool = ltiService.getToolDao(toolKey, ref.getContext()); if ( tool != null ) { diff --git a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/BaseLTIService.java b/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/BaseLTIService.java index e6732572d499..b5c2462e160b 100644 --- a/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/BaseLTIService.java +++ b/basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/BaseLTIService.java @@ -47,7 +47,6 @@ import org.sakaiproject.util.foorm.SakaiFoorm; import java.util.ArrayList; -import java.util.Map; import java.util.Properties; /** diff --git a/basiclti/basiclti-pack/src/webapp/WEB-INF/components.xml b/basiclti/basiclti-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from basiclti/basiclti-pack/src/webapp/WEB-INF/components.xml rename to basiclti/basiclti-impl/src/webapp/WEB-INF/components.xml diff --git a/basiclti/basiclti-pack/pom.xml b/basiclti/basiclti-pack/pom.xml deleted file mode 100644 index 9712e4980e24..000000000000 --- a/basiclti/basiclti-pack/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - - basiclti - org.sakaiproject.basiclti - 12-SNAPSHOT - - - BasicLTI Component Package (basiclti-pack) - org.sakaiproject.basiclti - basiclti-pack - - Sakai Project - http://sakaiproject.org/ - - 2009 - sakai-component - - - components - - - - - ${project.groupId} - basiclti-util - - - ${project.groupId} - basiclti-impl - - - diff --git a/basiclti/basiclti-tool/pom.xml b/basiclti/basiclti-tool/pom.xml index 1398d3c1b670..4a6805993c23 100644 --- a/basiclti/basiclti-tool/pom.xml +++ b/basiclti/basiclti-tool/pom.xml @@ -19,12 +19,7 @@ war - - - ${project.groupId} - basiclti-impl - ${project.version} - + diff --git a/basiclti/pom.xml b/basiclti/pom.xml index 26854b26e9de..e745fb8c887e 100644 --- a/basiclti/pom.xml +++ b/basiclti/pom.xml @@ -25,7 +25,6 @@ basiclti-api basiclti-docs basiclti-impl - basiclti-pack basiclti-portlet basiclti-blis basiclti-tool diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml index c4e6108dbfd7..718d9d8f6c47 100644 --- a/calendar/calendar-impl/impl/pom.xml +++ b/calendar/calendar-impl/impl/pom.xml @@ -17,7 +17,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component + + components + diff --git a/calendar/calendar-impl/pack/src/webapp/WEB-INF/components.xml b/calendar/calendar-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from calendar/calendar-impl/pack/src/webapp/WEB-INF/components.xml rename to calendar/calendar-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/calendar/calendar-impl/pack/src/webapp/WEB-INF/hibernate-hbms.xml b/calendar/calendar-impl/impl/src/webapp/WEB-INF/hibernate-hbms.xml similarity index 100% rename from calendar/calendar-impl/pack/src/webapp/WEB-INF/hibernate-hbms.xml rename to calendar/calendar-impl/impl/src/webapp/WEB-INF/hibernate-hbms.xml diff --git a/calendar/calendar-impl/pack/pom.xml b/calendar/calendar-impl/pack/pom.xml deleted file mode 100644 index f9992aad9975..000000000000 --- a/calendar/calendar-impl/pack/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.calendar - calendar - 12-SNAPSHOT - ../../pom.xml - - - sakai-calendar-pack - org.sakaiproject.calendar - sakai-calendar-pack - - The Sakai Foundation - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-calendar-impl - ${project.version} - - - diff --git a/calendar/pom.xml b/calendar/pom.xml index 77cfe06e96b9..1e0fffca0c33 100644 --- a/calendar/pom.xml +++ b/calendar/pom.xml @@ -19,7 +19,6 @@ calendar-bundles calendar-hbm calendar-impl/impl - calendar-impl/pack calendar-summary-tool/tool calendar-tool/tool calendar-util/util diff --git a/chat/chat-impl/impl/pom.xml b/chat/chat-impl/impl/pom.xml index 2a47114d3c96..3f23863d0d22 100644 --- a/chat/chat-impl/impl/pom.xml +++ b/chat/chat-impl/impl/pom.xml @@ -16,9 +16,9 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components diff --git a/chat/chat-impl/pack/src/webapp/WEB-INF/components.xml b/chat/chat-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from chat/chat-impl/pack/src/webapp/WEB-INF/components.xml rename to chat/chat-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/chat/chat-impl/pack/pom.xml b/chat/chat-impl/pack/pom.xml deleted file mode 100644 index 114b5badb9b1..000000000000 --- a/chat/chat-impl/pack/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - chat-base - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - sakai-chat-pack - org.sakaiproject - sakai-chat-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject.kernel - sakai-kernel-private - - - org.sakaiproject - sakai-chat-impl - - - - - - diff --git a/chat/pom.xml b/chat/pom.xml index 868a2ad0e8f1..d92d02b85786 100644 --- a/chat/pom.xml +++ b/chat/pom.xml @@ -15,7 +15,6 @@ chat-api/api chat-impl/impl - chat-impl/pack chat-tool/tool diff --git a/citations/citations-impl/impl/pom.xml b/citations/citations-impl/impl/pom.xml index 2f6dd7bfe004..11e40799d12b 100644 --- a/citations/citations-impl/impl/pom.xml +++ b/citations/citations-impl/impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components diff --git a/citations/citations-impl/pack/src/webapp/WEB-INF/components.xml b/citations/citations-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from citations/citations-impl/pack/src/webapp/WEB-INF/components.xml rename to citations/citations-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/citations/citations-impl/pack/pom.xml b/citations/citations-impl/pack/pom.xml deleted file mode 100644 index 13c33d8c4696..000000000000 --- a/citations/citations-impl/pack/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - 4.0.0 - - citations-base - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - sakai-citations-pack - org.sakaiproject - sakai-citations-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject.kernel - sakai-kernel-util - - - org.sakaiproject - sakai-citations-impl - - - OKI - OkiOSID - - - org.sakaiproject - sakai-user-util - - - org.sakaiproject.velocity - sakai-velocity-tool - - - - - org.sakaiproject - sakai-citations-util - - - org.sakaiproject - sakai-citations-web2bridge - - - org.sakaiproject - sakai-citations-xserver - - - zing - cql-java - 0.7 - - - - - - src/java - - diff --git a/citations/citations-servlet/servlet/pom.xml b/citations/citations-servlet/servlet/pom.xml index bd72e51414cb..f83f518113f8 100644 --- a/citations/citations-servlet/servlet/pom.xml +++ b/citations/citations-servlet/servlet/pom.xml @@ -37,24 +37,6 @@ org.sakaiproject sakai-citations-api - - org.sakaiproject - sakai-citations-impl - - - OKI - OkiOSID - - - org.sakaiproject.velocity - sakai-velocity-tool - - - org.sakaiproject - sakai-content-util - - - org.sakaiproject sakai-citations-util diff --git a/citations/pom.xml b/citations/pom.xml index e2d8a99f2074..1ba84ae94f0a 100644 --- a/citations/pom.xml +++ b/citations/pom.xml @@ -21,7 +21,6 @@ citations-osid/web2bridge citations-osid/xserver citations-impl/impl - citations-impl/pack diff --git a/cloud-content/impl/pom.xml b/cloud-content/impl/pom.xml index 9185f73d665b..3edbc3f9479a 100644 --- a/cloud-content/impl/pom.xml +++ b/cloud-content/impl/pom.xml @@ -11,10 +11,11 @@ Sakai Cloud Resources Providers (impl) org.sakaiproject.content cloud-content-impl - jar + sakai-component 1.9.1 + components diff --git a/cloud-content/pack/src/webapp/WEB-INF/components.xml b/cloud-content/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from cloud-content/pack/src/webapp/WEB-INF/components.xml rename to cloud-content/impl/src/webapp/WEB-INF/components.xml diff --git a/cloud-content/pack/pom.xml b/cloud-content/pack/pom.xml deleted file mode 100644 index 4c56c47fc781..000000000000 --- a/cloud-content/pack/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - org.sakaiproject.content - cloud-content - 12-SNAPSHOT - ../pom.xml - - - Sakai Cloud Resources Components - org.sakaiproject.content - cloud-content-pack - - sakai-component - - components - - - - org.sakaiproject.content - cloud-content-impl - ${project.version} - - - - diff --git a/cloud-content/pom.xml b/cloud-content/pom.xml index d20c6638260b..affe3ab9af10 100644 --- a/cloud-content/pom.xml +++ b/cloud-content/pom.xml @@ -20,7 +20,6 @@ impl - pack diff --git a/common/archive-impl/impl2/pom.xml b/common/archive-impl/impl2/pom.xml index 24c5deb513aa..a1f98c8a6f11 100644 --- a/common/archive-impl/impl2/pom.xml +++ b/common/archive-impl/impl2/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2006 - jar + sakai-component - + components diff --git a/common/archive-impl/pack/src/webapp/WEB-INF/components.xml b/common/archive-impl/impl2/src/webapp/WEB-INF/components.xml similarity index 100% rename from common/archive-impl/pack/src/webapp/WEB-INF/components.xml rename to common/archive-impl/impl2/src/webapp/WEB-INF/components.xml diff --git a/common/archive-impl/pack/pom.xml b/common/archive-impl/pack/pom.xml deleted file mode 100644 index 40ff6afcd470..000000000000 --- a/common/archive-impl/pack/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - common - org.sakaiproject.common - 12-SNAPSHOT - ../../pom.xml - - archive-pack - org.sakaiproject.common - archive-pack - - Sakai Foundation - http://sakaiproject.org/ - - - 2003 - sakai-component - - components - - - - org.sakaiproject.common - archive-impl2 - - - - - - - diff --git a/common/common-composite-component/pom.xml b/common/common-composite-component/pom.xml index 21679563aeae..7af2e6ff0a0a 100644 --- a/common/common-composite-component/pom.xml +++ b/common/common-composite-component/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components diff --git a/common/pack/src/webapp/WEB-INF/components.xml b/common/common-composite-component/src/webapp/WEB-INF/components.xml similarity index 100% rename from common/pack/src/webapp/WEB-INF/components.xml rename to common/common-composite-component/src/webapp/WEB-INF/components.xml diff --git a/common/pack/pom.xml b/common/pack/pom.xml deleted file mode 100644 index 317692829af5..000000000000 --- a/common/pack/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - common - org.sakaiproject.common - 12-SNAPSHOT - ../pom.xml - - Sakai Common Components Package - org.sakaiproject.common - sakai-common-components - - Sakai Project - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject.common - sakai-common-composite-component - runtime - - - commons-beanutils - commons-beanutils - - - - - - - diff --git a/common/pom.xml b/common/pom.xml index c02c7b0c198c..b3efb85f08dd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -13,7 +13,6 @@ pom - pack common-composite-component impl edu-person-api @@ -21,16 +20,13 @@ type-api privacy-api privacy-comp-impl - privacy-components privacy-hbm archive-api archive-impl/impl2 - archive-impl/pack import-impl import-handlers/content-handlers - import-pack import-util import-parsers/common-cartridge import-parsers/sakai-archive diff --git a/common/privacy-comp-impl/pom.xml b/common/privacy-comp-impl/pom.xml index f0a61426afc0..56005551304f 100644 --- a/common/privacy-comp-impl/pom.xml +++ b/common/privacy-comp-impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2004 - jar + sakai-component - + components diff --git a/common/privacy-components/src/webapp/WEB-INF/components.xml b/common/privacy-comp-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from common/privacy-components/src/webapp/WEB-INF/components.xml rename to common/privacy-comp-impl/src/webapp/WEB-INF/components.xml diff --git a/config/localization/bundles/pom.xml b/config/localization/bundles/pom.xml index 45e23d993f3b..5855784273d3 100644 --- a/config/localization/bundles/pom.xml +++ b/config/localization/bundles/pom.xml @@ -15,12 +15,10 @@ http://sakaiproject.org/ 2003 - jar - diff --git a/config/localization/pack/src/webapp/WEB-INF/components.xml b/config/localization/bundles/src/webapp/WEB-INF/components.xml similarity index 100% rename from config/localization/pack/src/webapp/WEB-INF/components.xml rename to config/localization/bundles/src/webapp/WEB-INF/components.xml diff --git a/config/localization/pack/pom.xml b/config/localization/pack/pom.xml deleted file mode 100644 index 48002d18a52b..000000000000 --- a/config/localization/pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - config - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - localization-pack - org.sakaiproject - localization-bundles-pack - - Sakai Foundation - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject - localization-bundles - ${project.version} - - - - - - diff --git a/config/pom.xml b/config/pom.xml index 9c54a8a8a5e7..c338c180abfa 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -35,9 +35,7 @@ configuration/bundles localization/bundles - localization/pack sharedI18n/bundles - sharedI18n/pack diff --git a/config/sharedI18n/bundles/pom.xml b/config/sharedI18n/bundles/pom.xml index b33df2205177..8088dc58cd61 100644 --- a/config/sharedI18n/bundles/pom.xml +++ b/config/sharedI18n/bundles/pom.xml @@ -15,12 +15,10 @@ http://sakaiproject.org/ 2003 - jar - diff --git a/config/sharedI18n/pack/src/webapp/WEB-INF/components.xml b/config/sharedI18n/bundles/src/webapp/WEB-INF/components.xml similarity index 100% rename from config/sharedI18n/pack/src/webapp/WEB-INF/components.xml rename to config/sharedI18n/bundles/src/webapp/WEB-INF/components.xml diff --git a/config/sharedI18n/pack/pom.xml b/config/sharedI18n/pack/pom.xml deleted file mode 100644 index 60df1f39ae89..000000000000 --- a/config/sharedI18n/pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - config - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - shared-i18n-pack - org.sakaiproject - shared-i18n-bundles-pack - - Sakai Foundation - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject - shared-i18n-bundles - ${project.version} - - - - - - diff --git a/content/content-cleanup/content-cleanup-impl/pom.xml b/content/content-cleanup/content-cleanup-impl/pom.xml index 78da37ad7573..dceb20c2dcda 100644 --- a/content/content-cleanup/content-cleanup-impl/pom.xml +++ b/content/content-cleanup/content-cleanup-impl/pom.xml @@ -12,6 +12,10 @@ content-cleanup-impl content-cleanup-impl http://maven.apache.org + sakai-component + + components + org.sakaiproject.kernel diff --git a/content/content-cleanup/content-cleanup-pack/src/webapp/WEB-INF/components.xml b/content/content-cleanup/content-cleanup-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from content/content-cleanup/content-cleanup-pack/src/webapp/WEB-INF/components.xml rename to content/content-cleanup/content-cleanup-impl/src/webapp/WEB-INF/components.xml diff --git a/content/content-cleanup/content-cleanup-pack/pom.xml b/content/content-cleanup/content-cleanup-pack/pom.xml deleted file mode 100644 index 21142ae00732..000000000000 --- a/content/content-cleanup/content-cleanup-pack/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - content-cleanup - org.sakaiproject.content - 12-SNAPSHOT - ../pom.xml - - org.sakaiproject.content - content-cleanup-pack - content-cleanup-pack - sakai-component - - components - - - - org.sakaiproject.content - content-cleanup-impl - ${project.version} - - - diff --git a/content/content-cleanup/pom.xml b/content/content-cleanup/pom.xml index dd86c0be8926..7ccfb6c7b79a 100644 --- a/content/content-cleanup/pom.xml +++ b/content/content-cleanup/pom.xml @@ -14,6 +14,5 @@ http://maven.apache.org content-cleanup-impl - content-cleanup-pack diff --git a/content/content-copyright/impl/pom.xml b/content/content-copyright/impl/pom.xml index 7af5faded67e..d80e870f6fd1 100644 --- a/content/content-copyright/impl/pom.xml +++ b/content/content-copyright/impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2011 - jar + sakai-component - + component diff --git a/content/content-copyright/pack/src/webapp/WEB-INF/components.xml b/content/content-copyright/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from content/content-copyright/pack/src/webapp/WEB-INF/components.xml rename to content/content-copyright/impl/src/webapp/WEB-INF/components.xml diff --git a/content/content-copyright/pack/pom.xml b/content/content-copyright/pack/pom.xml deleted file mode 100644 index b6e0f340de1b..000000000000 --- a/content/content-copyright/pack/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - content - org.sakaiproject.content - 12-SNAPSHOT - ../../pom.xml - - sakai-content-copyright-pack - org.sakaiproject.content - content-copyright-pack - - Sakai Spanish Universities - http://sakaiproject.org/ - - 2011 - sakai-component - - components - - - - org.sakaiproject.content - content-copyright-impl - ${project.version} - - - - - - - diff --git a/content/content-impl-providers/impl/pom.xml b/content/content-impl-providers/impl/pom.xml index 38f4218e93ef..c3f8f8a42644 100644 --- a/content/content-impl-providers/impl/pom.xml +++ b/content/content-impl-providers/impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components diff --git a/content/content-impl-providers/pack/src/webapp/WEB-INF/components.xml b/content/content-impl-providers/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from content/content-impl-providers/pack/src/webapp/WEB-INF/components.xml rename to content/content-impl-providers/impl/src/webapp/WEB-INF/components.xml diff --git a/content/content-impl-providers/pack/pom.xml b/content/content-impl-providers/pack/pom.xml deleted file mode 100644 index 387a202add0f..000000000000 --- a/content/content-impl-providers/pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - content - org.sakaiproject.content - 12-SNAPSHOT - ../../pom.xml - - content-providers-pack - org.sakaiproject.content - content-providers-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject.content - content-providers-impl - - - - - - - diff --git a/content/content-metadata/impl/pom.xml b/content/content-metadata/impl/pom.xml index bf64c2600153..36b9bfdf19cd 100644 --- a/content/content-metadata/impl/pom.xml +++ b/content/content-metadata/impl/pom.xml @@ -13,10 +13,7 @@ content-metadata-impl org.sakaiproject.content content-metadata-impl - jar - - - + sakai-component org.sakaiproject.kernel diff --git a/content/content-metadata/pack/src/webapp/WEB-INF/components.xml b/content/content-metadata/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from content/content-metadata/pack/src/webapp/WEB-INF/components.xml rename to content/content-metadata/impl/src/webapp/WEB-INF/components.xml diff --git a/content/content-metadata/pack/pom.xml b/content/content-metadata/pack/pom.xml deleted file mode 100644 index a0e928f6dbd8..000000000000 --- a/content/content-metadata/pack/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - org.sakaiproject.content - content - 12-SNAPSHOT - ../../pom.xml - - org.sakaiproject.content - content-metadata-pack - content-metadata-pack - sakai-component - - components - - - - org.sakaiproject.content - content-metadata-impl - - - - - - diff --git a/content/content-types-pack/pom.xml b/content/content-types-pack/pom.xml deleted file mode 100644 index 59a3e329aa47..000000000000 --- a/content/content-types-pack/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.content - content - 12-SNAPSHOT - - - Sakai Content Types Component Package - org.sakaiproject.content - content-types-pack - sakai-component - - - This project creates the pack used by the Sakai Content Types - - - - components - - - - - ${project.groupId} - content-types - ${project.version} - - - diff --git a/content/content-types/pom.xml b/content/content-types/pom.xml index 7f778a8c88f7..ea70e84e8f32 100644 --- a/content/content-types/pom.xml +++ b/content/content-types/pom.xml @@ -15,7 +15,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component + + components + diff --git a/content/content-types-pack/src/webapp/WEB-INF/components.xml b/content/content-types/src/webapp/WEB-INF/components.xml similarity index 100% rename from content/content-types-pack/src/webapp/WEB-INF/components.xml rename to content/content-types/src/webapp/WEB-INF/components.xml diff --git a/content/pom.xml b/content/pom.xml index 0680ae23fcf8..13883cc504e1 100644 --- a/content/pom.xml +++ b/content/pom.xml @@ -26,7 +26,6 @@ content-metadata/api content-metadata/impl - content-metadata/pack @@ -38,16 +37,12 @@ content-cleanup content-copyright/api content-copyright/impl - content-copyright/pack content-impl-providers/impl - content-impl-providers/pack content-metadata/api content-metadata/impl - content-metadata/pack content-tool/tool content-bundles content-types - content-types-pack diff --git a/courier/courier-impl/impl/pom.xml b/courier/courier-impl/impl/pom.xml index fbaa0a5df8a0..a8360f7cda8b 100644 --- a/courier/courier-impl/impl/pom.xml +++ b/courier/courier-impl/impl/pom.xml @@ -17,10 +17,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components diff --git a/courier/courier-impl/pack/src/webapp/WEB-INF/components.xml b/courier/courier-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from courier/courier-impl/pack/src/webapp/WEB-INF/components.xml rename to courier/courier-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/courier/courier-impl/pack/pom.xml b/courier/courier-impl/pack/pom.xml deleted file mode 100644 index 7c47315a7bdd..000000000000 --- a/courier/courier-impl/pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.courier - courier - 12-SNAPSHOT - ../../pom.xml - - - sakai-courier-pack - org.sakaiproject.courier - sakai-courier-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-courier-impl - - - diff --git a/courier/pom.xml b/courier/pom.xml index 092f0a4bc507..1bf3b55a3bbb 100644 --- a/courier/pom.xml +++ b/courier/pom.xml @@ -17,7 +17,6 @@ courier-api/api courier-impl/impl - courier-impl/pack courier-tool/tool courier-util/util diff --git a/dashboard/impl/pom.xml b/dashboard/impl/pom.xml index c9b0e6e2f67c..709a92038137 100644 --- a/dashboard/impl/pom.xml +++ b/dashboard/impl/pom.xml @@ -13,7 +13,10 @@ org.sakaiproject.dash dashboard-impl - jar + sakai-component + + components + org.hibernate @@ -61,6 +64,10 @@ org.sakaiproject.dash dashboard-hbm + + + org.sakaiproject.dash + dashboard-bundles org.sakaiproject.assignment diff --git a/dashboard/pack/src/webapp/WEB-INF/components.xml b/dashboard/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from dashboard/pack/src/webapp/WEB-INF/components.xml rename to dashboard/impl/src/webapp/WEB-INF/components.xml diff --git a/dashboard/pack/pom.xml b/dashboard/pack/pom.xml deleted file mode 100644 index b6d63ea242d1..000000000000 --- a/dashboard/pack/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - 4.0.0 - - dashboard - org.sakaiproject.dash - 12-SNAPSHOT - - - dashboard - Components - org.sakaiproject.dash - dashboard-pack - - sakai-component - - - components - - - - - - - org.sakaiproject.dash - dashboard-impl - - - - org.sakaiproject.dash - dashboard-bundles - - - - - - - - diff --git a/dashboard/pom.xml b/dashboard/pom.xml index e912a411eb30..e53ebd48b159 100644 --- a/dashboard/pom.xml +++ b/dashboard/pom.xml @@ -69,7 +69,6 @@ api impl util - pack hbm diff --git a/delegatedaccess/impl/pom.xml b/delegatedaccess/impl/pom.xml index 011e8e2a0877..e0bd3c4e7deb 100644 --- a/delegatedaccess/impl/pom.xml +++ b/delegatedaccess/impl/pom.xml @@ -13,7 +13,10 @@ org.sakaiproject.delegatedaccess delegatedaccess-impl - jar + sakai-component + + components + diff --git a/delegatedaccess/pack/src/webapp/WEB-INF/components-demo.xml b/delegatedaccess/impl/src/webapp/WEB-INF/components-demo.xml similarity index 100% rename from delegatedaccess/pack/src/webapp/WEB-INF/components-demo.xml rename to delegatedaccess/impl/src/webapp/WEB-INF/components-demo.xml diff --git a/delegatedaccess/pack/src/webapp/WEB-INF/components.xml b/delegatedaccess/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from delegatedaccess/pack/src/webapp/WEB-INF/components.xml rename to delegatedaccess/impl/src/webapp/WEB-INF/components.xml diff --git a/delegatedaccess/pack/pom.xml b/delegatedaccess/pack/pom.xml deleted file mode 100644 index f1f8870a2520..000000000000 --- a/delegatedaccess/pack/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - delegatedaccess - org.sakaiproject.delegatedaccess - 12-SNAPSHOT - - - Delegated Access - Components - org.sakaiproject.delegatedaccess - delegatedaccess-pack - - sakai-component - - - components - - - - - - org.sakaiproject.delegatedaccess - delegatedaccess-impl - - - - - diff --git a/delegatedaccess/pom.xml b/delegatedaccess/pom.xml index d8f5a8eb2d14..231594d90091 100644 --- a/delegatedaccess/pom.xml +++ b/delegatedaccess/pom.xml @@ -24,7 +24,6 @@ tool api impl - pack diff --git a/edu-services/scoring-service/impl/pom.xml b/edu-services/scoring-service/impl/pom.xml index 8712ff1b53b4..e34353eb5cda 100644 --- a/edu-services/scoring-service/impl/pom.xml +++ b/edu-services/scoring-service/impl/pom.xml @@ -12,7 +12,10 @@ scoring-service-impl org.sakaiproject.edu-services.scoringservice - jar + sakai-component + + components + scoring-service-api diff --git a/edu-services/scoring-service/pack/src/webapp/WEB-INF/components.xml b/edu-services/scoring-service/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from edu-services/scoring-service/pack/src/webapp/WEB-INF/components.xml rename to edu-services/scoring-service/impl/src/webapp/WEB-INF/components.xml diff --git a/edu-services/scoring-service/pack/pom.xml b/edu-services/scoring-service/pack/pom.xml deleted file mode 100644 index ddda9a36a836..000000000000 --- a/edu-services/scoring-service/pack/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - scoring-service - org.sakaiproject.edu-services.scoringservice - 12-SNAPSHOT - ../pom.xml - - 4.0.0 - - scoring-service-component - org.sakaiproject.edu-services.scoringservice - - sakai-component - - components - - - - scoring-service-impl - org.sakaiproject.edu-services.scoringservice - - - - - diff --git a/edu-services/scoring-service/pom.xml b/edu-services/scoring-service/pom.xml index 48e43a4869dc..c10aefd1c6e0 100644 --- a/edu-services/scoring-service/pom.xml +++ b/edu-services/scoring-service/pom.xml @@ -17,7 +17,6 @@ api impl - pack diff --git a/edu-services/sections-service/pom.xml b/edu-services/sections-service/pom.xml index ad701b3327e5..1451b196e921 100644 --- a/edu-services/sections-service/pom.xml +++ b/edu-services/sections-service/pom.xml @@ -16,7 +16,6 @@ sections-impl/sakai/impl sections-impl/sakai/model - sections-impl/sakai/pack sections-impl/standalone diff --git a/edu-services/sections-service/sections-impl/sakai/impl/pom.xml b/edu-services/sections-service/sections-impl/sakai/impl/pom.xml index e91fc838f9fb..2abd3f144546 100644 --- a/edu-services/sections-service/sections-impl/sakai/impl/pom.xml +++ b/edu-services/sections-service/sections-impl/sakai/impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2005 - jar + sakai-component - + components diff --git a/edu-services/sections-service/sections-impl/sakai/pack/src/webapp/WEB-INF/components.xml b/edu-services/sections-service/sections-impl/sakai/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from edu-services/sections-service/sections-impl/sakai/pack/src/webapp/WEB-INF/components.xml rename to edu-services/sections-service/sections-impl/sakai/impl/src/webapp/WEB-INF/components.xml diff --git a/edu-services/sections-service/sections-impl/sakai/pack/pom.xml b/edu-services/sections-service/sections-impl/sakai/pack/pom.xml deleted file mode 100644 index 07074af3a3c6..000000000000 --- a/edu-services/sections-service/sections-impl/sakai/pack/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - sections - org.sakaiproject.edu-services.sections - 12-SNAPSHOT - ../../../pom.xml - - sakai-sections-pack - org.sakaiproject.edu-services.sections - sections-pack - - Sakai Project - http://sakaiproject.org/ - - 2005 - - - sakai-component - - components - - - - org.sakaiproject.edu-services.sections - sections-impl - - - - - - diff --git a/emailtemplateservice/impl/logic/pom.xml b/emailtemplateservice/impl/logic/pom.xml index c5095bc61619..7cd16e3709c9 100644 --- a/emailtemplateservice/impl/logic/pom.xml +++ b/emailtemplateservice/impl/logic/pom.xml @@ -17,10 +17,10 @@ 2007 Emailtemplateservice implementation - jar + sakai-component - + components diff --git a/emailtemplateservice/pack/src/webapp/WEB-INF/components.xml b/emailtemplateservice/impl/logic/src/webapp/WEB-INF/components.xml similarity index 100% rename from emailtemplateservice/pack/src/webapp/WEB-INF/components.xml rename to emailtemplateservice/impl/logic/src/webapp/WEB-INF/components.xml diff --git a/emailtemplateservice/pack/src/webapp/WEB-INF/hibernate-hbms.xml b/emailtemplateservice/impl/logic/src/webapp/WEB-INF/hibernate-hbms.xml similarity index 100% rename from emailtemplateservice/pack/src/webapp/WEB-INF/hibernate-hbms.xml rename to emailtemplateservice/impl/logic/src/webapp/WEB-INF/hibernate-hbms.xml diff --git a/emailtemplateservice/pack/pom.xml b/emailtemplateservice/pack/pom.xml deleted file mode 100644 index 038e1e6c478f..000000000000 --- a/emailtemplateservice/pack/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - - - org.sakaiproject.emailtemplateservice - emailtemplateservice - 12-SNAPSHOT - - - Sakai Emailtemplateservice Components Package (emailtemplateservice-pack) - org.sakaiproject.emailtemplateservice - emailtemplateservice-pack - - Sakai Project - http://sakaiproject.org/ - - 2007 - - Emailtemplateservice components pack (special Sakai convention). - - sakai-component - - - components - - - - - ${project.groupId} - emailtemplateservice-impl - runtime - - - - - diff --git a/emailtemplateservice/pom.xml b/emailtemplateservice/pom.xml index ad3fdc163b43..2dd8639a3817 100644 --- a/emailtemplateservice/pom.xml +++ b/emailtemplateservice/pom.xml @@ -26,7 +26,6 @@ api deploy impl/logic - pack tool diff --git a/external-calendaring-service/impl/pom.xml b/external-calendaring-service/impl/pom.xml index a9675fb6a827..aa9f12404bf2 100644 --- a/external-calendaring-service/impl/pom.xml +++ b/external-calendaring-service/impl/pom.xml @@ -11,7 +11,11 @@ External Calendaring Service :: Implementation org.sakaiproject.calendaring external-calendaring-service-impl - jar + sakai-component + + components + + diff --git a/external-calendaring-service/pack/src/webapp/WEB-INF/components.xml b/external-calendaring-service/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from external-calendaring-service/pack/src/webapp/WEB-INF/components.xml rename to external-calendaring-service/impl/src/webapp/WEB-INF/components.xml diff --git a/external-calendaring-service/pack/pom.xml b/external-calendaring-service/pack/pom.xml deleted file mode 100644 index d809d9a809a1..000000000000 --- a/external-calendaring-service/pack/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - 4.0.0 - - - external-calendaring-service - org.sakaiproject.calendaring - 12-SNAPSHOT - - - External Calendaring Service :: Components - org.sakaiproject.calendaring - external-calendaring-service-pack - sakai-component - - - components - - - - - org.sakaiproject.calendaring - external-calendaring-service-impl - - - - - diff --git a/external-calendaring-service/pom.xml b/external-calendaring-service/pom.xml index fae5b3eea1c2..bed9626ec58a 100644 --- a/external-calendaring-service/pom.xml +++ b/external-calendaring-service/pom.xml @@ -36,7 +36,6 @@ api impl - pack diff --git a/hierarchy/impl/pom.xml b/hierarchy/impl/pom.xml index 567d35c0b3f1..685c5cca8fd8 100644 --- a/hierarchy/impl/pom.xml +++ b/hierarchy/impl/pom.xml @@ -11,7 +11,11 @@ Sakai Hierarchy Implementation org.sakaiproject.hierarchy hierarchy-impl - jar + sakai-component + + components + + @@ -187,7 +191,7 @@ - ${basedir}/../pack/src/webapp/WEB-INF + ${basedir}/src/webapp/WEB-INF spring-hibernate.xml logic-support.xml diff --git a/hierarchy/pack/src/webapp/WEB-INF/components.xml b/hierarchy/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from hierarchy/pack/src/webapp/WEB-INF/components.xml rename to hierarchy/impl/src/webapp/WEB-INF/components.xml diff --git a/hierarchy/pack/src/webapp/WEB-INF/sakai-hibernate.xml b/hierarchy/impl/src/webapp/WEB-INF/sakai-hibernate.xml similarity index 100% rename from hierarchy/pack/src/webapp/WEB-INF/sakai-hibernate.xml rename to hierarchy/impl/src/webapp/WEB-INF/sakai-hibernate.xml diff --git a/hierarchy/pack/src/webapp/WEB-INF/spring-hibernate.xml b/hierarchy/impl/src/webapp/WEB-INF/spring-hibernate.xml similarity index 100% rename from hierarchy/pack/src/webapp/WEB-INF/spring-hibernate.xml rename to hierarchy/impl/src/webapp/WEB-INF/spring-hibernate.xml diff --git a/hierarchy/pack/pom.xml b/hierarchy/pack/pom.xml deleted file mode 100644 index e1d148834d90..000000000000 --- a/hierarchy/pack/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - 4.0.0 - - - hierarchy - org.sakaiproject - 12-SNAPSHOT - - - Sakai Hierarchy Components Pack - org.sakaiproject.hierarchy - hierarchy-pack - - sakai-component - - - components - - - - - org.sakaiproject.hierarchy - hierarchy-impl - runtime - - - - - diff --git a/hierarchy/pom.xml b/hierarchy/pom.xml index 3f6b9e061bae..7e1f23efa9d9 100644 --- a/hierarchy/pom.xml +++ b/hierarchy/pom.xml @@ -36,7 +36,6 @@ api impl - pack diff --git a/kernel/kernel-component/pom.xml b/kernel/kernel-component/pom.xml deleted file mode 100644 index 368fa00ed978..000000000000 --- a/kernel/kernel-component/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - kernel - org.sakaiproject - 12-SNAPSHOT - ../pom.xml - - Sakai Kernel Component Package - org.sakaiproject.kernel - sakai-kernel-component - - Sakai Foundation - http://sakaiproject.org/ - - 2003 - - sakai-component - - components - true - true - - - - org.sakaiproject.kernel - sakai-kernel-api - - - org.sakaiproject.kernel - sakai-kernel-impl - ${project.version} - - - org.sakaiproject.kernel - sakai-kernel-private - ${project.version} - - - - xerces - xmlParserAPIs - runtime - - - xerces - xercesImpl - runtime - - - - diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml index 660b9c7df002..5669ee7353af 100644 --- a/kernel/kernel-impl/pom.xml +++ b/kernel/kernel-impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components ${basedir}/.. @@ -246,6 +246,16 @@ antisamy 1.5.5 + + xerces + xmlParserAPIs + runtime + + + xerces + xercesImpl + runtime + org.jsoup diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/memory/impl/EhcacheCache.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/memory/impl/EhcacheCache.java index 1cb8eb1cda5f..89fb6cc9e293 100644 --- a/kernel/kernel-impl/src/main/java/org/sakaiproject/memory/impl/EhcacheCache.java +++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/memory/impl/EhcacheCache.java @@ -99,6 +99,7 @@ public V get(K key) { } } else { value = (V) element.getObjectValue(); + ArrayList w = new ArrayList(); } return value; } // get diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/alias-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/alias-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/alias-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/alias-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/antivirus-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/antivirus-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/antivirus-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/antivirus-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/authz-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/authz-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/authz-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/authz-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/cluster-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/cluster-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/cluster-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/cluster-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/component-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/component-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/component-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/component-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/conditions-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/conditions-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/conditions-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/conditions-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/configstore-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/configstore-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/configstore-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/configstore-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/content-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/content-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/content-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/content-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/db-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/db-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/db-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/db-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/email-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/email-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/email-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/email-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/entity-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/entity-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/entity-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/entity-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/event-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/event-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/event-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/event-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/memory-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/memory-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/memory-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/memory-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/messagebundle-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/messagebundle-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/messagebundle-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/messagebundle-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/site-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/site-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/site-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/site-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/tool-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/tool-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/tool-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/tool-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/user-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/user-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/user-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/user-components.xml diff --git a/kernel/kernel-component/src/main/webapp/WEB-INF/util-components.xml b/kernel/kernel-impl/src/main/webapp/WEB-INF/util-components.xml similarity index 100% rename from kernel/kernel-component/src/main/webapp/WEB-INF/util-components.xml rename to kernel/kernel-impl/src/main/webapp/WEB-INF/util-components.xml diff --git a/kernel/kernel-impl/src/test/java/org/sakaiproject/test/SakaiKernelTestBase.java b/kernel/kernel-impl/src/test/java/org/sakaiproject/test/SakaiKernelTestBase.java index a85f787a2053..81400c2d5865 100644 --- a/kernel/kernel-impl/src/test/java/org/sakaiproject/test/SakaiKernelTestBase.java +++ b/kernel/kernel-impl/src/test/java/org/sakaiproject/test/SakaiKernelTestBase.java @@ -38,7 +38,7 @@ public class SakaiKernelTestBase { /** * The configuration path of the components file for the kernel component */ - private static String CONFIG = "../kernel-component/src/main/webapp/WEB-INF/components.xml"; + private static String CONFIG = "../kernel-impl/src/main/webapp/WEB-INF/components.xml"; /** * The test component manager container diff --git a/kernel/pom.xml b/kernel/pom.xml index a57ee263a31b..1cee72f70eaa 100644 --- a/kernel/pom.xml +++ b/kernel/pom.xml @@ -27,7 +27,6 @@ api component-manager kernel-private - kernel-component kernel-common kernel-impl kernel-util diff --git a/login/login-impl/impl/pom.xml b/login/login-impl/impl/pom.xml index 363d4b706c81..6ccdda072c5c 100644 --- a/login/login-impl/impl/pom.xml +++ b/login/login-impl/impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components diff --git a/login/login-impl/pack/src/webapp/WEB-INF/components.xml b/login/login-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from login/login-impl/pack/src/webapp/WEB-INF/components.xml rename to login/login-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/login/login-impl/pack/pom.xml b/login/login-impl/pack/pom.xml deleted file mode 100644 index 8419f3cbfb01..000000000000 --- a/login/login-impl/pack/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - login - org.sakaiproject.login - 12-SNAPSHOT - ../../pom.xml - - login-pack - org.sakaiproject.login - login-pack - - Sakai Foundation - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject.login - login-impl - ${project.version} - - - - - - - ${basedir}/src/bundle - - **/*.config - **/*.properties - **/*.vm - - - - - - ${basedir}/src/testBundle - - **/*.* - - false - - - src/java - - diff --git a/login/login-render-engine-impl/impl/pom.xml b/login/login-render-engine-impl/impl/pom.xml index db08a4fc2e8e..6f55793dc4a6 100644 --- a/login/login-render-engine-impl/impl/pom.xml +++ b/login/login-render-engine-impl/impl/pom.xml @@ -15,10 +15,7 @@ http://sakaiproject.org/ 2003 - jar - - - + war org.sakaiproject.kernel diff --git a/login/login-render-engine-impl/pack/src/webapp/WEB-INF/web.xml b/login/login-render-engine-impl/impl/src/webapp/WEB-INF/web.xml similarity index 100% rename from login/login-render-engine-impl/pack/src/webapp/WEB-INF/web.xml rename to login/login-render-engine-impl/impl/src/webapp/WEB-INF/web.xml diff --git a/login/login-render-engine-impl/pack/src/webapp/vm/defaultskin/choice.vm b/login/login-render-engine-impl/impl/src/webapp/vm/defaultskin/choice.vm similarity index 100% rename from login/login-render-engine-impl/pack/src/webapp/vm/defaultskin/choice.vm rename to login/login-render-engine-impl/impl/src/webapp/vm/defaultskin/choice.vm diff --git a/login/login-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm b/login/login-render-engine-impl/impl/src/webapp/vm/defaultskin/macros.vm similarity index 100% rename from login/login-render-engine-impl/pack/src/webapp/vm/defaultskin/macros.vm rename to login/login-render-engine-impl/impl/src/webapp/vm/defaultskin/macros.vm diff --git a/login/login-render-engine-impl/pack/src/webapp/vm/defaultskin/xlogin.vm b/login/login-render-engine-impl/impl/src/webapp/vm/defaultskin/xlogin.vm similarity index 100% rename from login/login-render-engine-impl/pack/src/webapp/vm/defaultskin/xlogin.vm rename to login/login-render-engine-impl/impl/src/webapp/vm/defaultskin/xlogin.vm diff --git a/login/login-render-engine-impl/pack/pom.xml b/login/login-render-engine-impl/pack/pom.xml deleted file mode 100644 index 79a6c88c792c..000000000000 --- a/login/login-render-engine-impl/pack/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - login - org.sakaiproject.login - 12-SNAPSHOT - ../../pom.xml - - login-render - org.sakaiproject.login - login-render - - University of California, Davis - http://sakaiproject.org/ - - 2003 - war - - - org.sakaiproject.login - login-render-engine-impl - ${project.version} - - - - - src/java - - diff --git a/login/pom.xml b/login/pom.xml index cbd6e8c90d7e..901f5d7e8697 100644 --- a/login/pom.xml +++ b/login/pom.xml @@ -15,9 +15,7 @@ login-api/api login-authn-tool/tool login-impl/impl - login-impl/pack login-render-engine-impl/impl - login-render-engine-impl/pack login-tool/tool diff --git a/mailarchive/mailarchive-impl/impl/pom.xml b/mailarchive/mailarchive-impl/impl/pom.xml index ac796fbb5ca9..ea68d24b64a6 100644 --- a/mailarchive/mailarchive-impl/impl/pom.xml +++ b/mailarchive/mailarchive-impl/impl/pom.xml @@ -17,10 +17,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components diff --git a/mailarchive/mailarchive-impl/pack/src/webapp/WEB-INF/components.xml b/mailarchive/mailarchive-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from mailarchive/mailarchive-impl/pack/src/webapp/WEB-INF/components.xml rename to mailarchive/mailarchive-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/mailarchive/mailarchive-impl/pack/pom.xml b/mailarchive/mailarchive-impl/pack/pom.xml deleted file mode 100644 index 05f574cee236..000000000000 --- a/mailarchive/mailarchive-impl/pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.mailarchive - mailarchive - 12-SNAPSHOT - ../../pom.xml - - - sakai-mailarchive-pack - org.sakaiproject.mailarchive - sakai-mailarchive-pack - - Sakai Foundation - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-mailarchive-impl - - - diff --git a/mailarchive/pom.xml b/mailarchive/pom.xml index ef919f8a9a65..a5b9180e30a7 100644 --- a/mailarchive/pom.xml +++ b/mailarchive/pom.xml @@ -17,7 +17,6 @@ mailarchive-api/api mailarchive-impl/impl - mailarchive-impl/pack mailarchive-subetha mailarchive-tool/tool diff --git a/mailsender/impl/pom.xml b/mailsender/impl/pom.xml index 3bbee7a81ca3..d9f7fa06249d 100644 --- a/mailsender/impl/pom.xml +++ b/mailsender/impl/pom.xml @@ -18,7 +18,12 @@ http://sakaiproject.org/ 2007 - jar + sakai-component + + components + + + diff --git a/mailsender/pack/src/webapp/WEB-INF/components.xml b/mailsender/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from mailsender/pack/src/webapp/WEB-INF/components.xml rename to mailsender/impl/src/webapp/WEB-INF/components.xml diff --git a/mailsender/pack/pom.xml b/mailsender/pack/pom.xml deleted file mode 100644 index f4f987a616e3..000000000000 --- a/mailsender/pack/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.mailsender - mailsender - 12-SNAPSHOT - - - Sakai Mail Sender Components Pack - org.sakaiproject.mailsender - mailsender-pack - Mail Sender components pack (special Sakai convention) - - Sakai Project - http://sakaiproject.org/ - - 2007 - sakai-component - - - components - - - - - - ${project.groupId} - mailsender-impl - - - diff --git a/mailsender/pom.xml b/mailsender/pom.xml index 2d16818e3479..896cc93059d2 100644 --- a/mailsender/pom.xml +++ b/mailsender/pom.xml @@ -22,7 +22,6 @@ api impl - pack tool diff --git a/master/pom.xml b/master/pom.xml index 2f7d20083ee8..9867e7369f6b 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -1972,6 +1972,9 @@ ${maven.tomcat.home} ${basedir}/src/webapp + + true diff --git a/message/pom.xml b/message/pom.xml index 9931cfb0eab7..e1e28eb4f617 100644 --- a/message/pom.xml +++ b/message/pom.xml @@ -19,7 +19,6 @@ message-util/util message-tool/tool search-adapters/impl - search-adapters/pack diff --git a/message/search-adapters/impl/pom.xml b/message/search-adapters/impl/pom.xml index e97a661ca87f..d427701600b4 100644 --- a/message/search-adapters/impl/pom.xml +++ b/message/search-adapters/impl/pom.xml @@ -12,10 +12,10 @@ message-search-adapters-impl org.sakaiproject.message message-search-adapters-impl - jar + sakai-component - + components diff --git a/message/search-adapters/pack/src/webapp/WEB-INF/components.xml b/message/search-adapters/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from message/search-adapters/pack/src/webapp/WEB-INF/components.xml rename to message/search-adapters/impl/src/webapp/WEB-INF/components.xml diff --git a/message/search-adapters/pack/src/webapp/WEB-INF/messageAdapterComponents.xml b/message/search-adapters/impl/src/webapp/WEB-INF/messageAdapterComponents.xml similarity index 100% rename from message/search-adapters/pack/src/webapp/WEB-INF/messageAdapterComponents.xml rename to message/search-adapters/impl/src/webapp/WEB-INF/messageAdapterComponents.xml diff --git a/message/search-adapters/pack/pom.xml b/message/search-adapters/pack/pom.xml deleted file mode 100644 index 9772574d86c4..000000000000 --- a/message/search-adapters/pack/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.message - message - 12-SNAPSHOT - ../../pom.xml - - - message-search-adapters-pack - org.sakaiproject.message - message-search-adapters-pack - sakai-component - - - components - - - - - ${project.groupId} - message-search-adapters-impl - ${project.version} - jar - - - - - - - ${basedir}/src/bundle - - **/*.* - - false - - - ${basedir}/src/java - - **/*.xml - - false - - - - - - ${basedir}/src/testBundle - - **/*.* - - false - - - - - - diff --git a/msgcntr/messageforums-component-impl/pom.xml b/msgcntr/messageforums-component-impl/pom.xml index c0a1f5a9b899..fdf1905d6056 100644 --- a/msgcntr/messageforums-component-impl/pom.xml +++ b/msgcntr/messageforums-component-impl/pom.xml @@ -14,9 +14,9 @@ http://sakaiproject.org/ 2005 - jar + sakai-component - + components diff --git a/msgcntr/messageforums-components/src/webapp/WEB-INF/components.xml b/msgcntr/messageforums-component-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from msgcntr/messageforums-components/src/webapp/WEB-INF/components.xml rename to msgcntr/messageforums-component-impl/src/webapp/WEB-INF/components.xml diff --git a/msgcntr/messageforums-components/pom.xml b/msgcntr/messageforums-components/pom.xml deleted file mode 100644 index a4bd73a217af..000000000000 --- a/msgcntr/messageforums-components/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - org.sakaiproject.msgcntr - msgcntr - 12-SNAPSHOT - - Sakai Message Forums Components - org.sakaiproject.msgcntr - messageforums-components - - Sakai Project - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject.msgcntr - messageforums-component-impl - - - org.sakaiproject.msgcntr - messageforums-hbm - - - - - - - - ${basedir}/src/bundle - - **/*.properties - - - - src/java - - **/*.xml - - - **/web.xml - - - - - diff --git a/msgcntr/pom.xml b/msgcntr/pom.xml index 0e26ec8272a3..2a33aa587806 100644 --- a/msgcntr/pom.xml +++ b/msgcntr/pom.xml @@ -16,7 +16,6 @@ messageforums-api messageforums-app - messageforums-components messageforums-component-impl messageforums-hbm diff --git a/oauth/dao-memory/pom.xml b/oauth/dao-memory/pom.xml deleted file mode 100755 index 6802efdee130..000000000000 --- a/oauth/dao-memory/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.oauth - oauth-base - 12-SNAPSHOT - ../pom.xml - - - oauth-dao-memory - jar - - OAuth In-memory DAO - - In memory implementation of the DAO used by the OAuth tool, allowing to save the configuration and tokens in - memory. - - - - - ${project.groupId} - oauth-api - provided - - - - diff --git a/oauth/dao-server-config/pom.xml b/oauth/dao-server-config/pom.xml deleted file mode 100755 index 72164a9f167e..000000000000 --- a/oauth/dao-server-config/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.oauth - oauth-base - 12-SNAPSHOT - ../pom.xml - - - oauth-dao-server-config - jar - - OAuth ServerConfig DAO - - In properties implementation of the DAO used by the OAuth tool, allowing to retrieve the configuration from the - sakai.properties file. It must be used with an other DAO implementation to store tokens. - - - - - ${project.groupId} - oauth-api - provided - - - org.sakaiproject.kernel - sakai-component-manager - provided - - - - diff --git a/oauth/impl/pom.xml b/oauth/impl/pom.xml index 500d8ee9774d..8fc10ada195e 100755 --- a/oauth/impl/pom.xml +++ b/oauth/impl/pom.xml @@ -10,7 +10,10 @@ oauth-impl - jar + sakai-component + + components + OAuth Implementation Default implementation of the OAuth project for Sakai CLE using OAuth 1.0. @@ -26,6 +29,11 @@ sakai-kernel-api provided + + org.sakaiproject.kernel + sakai-component-manager + provided + javax.servlet diff --git a/oauth/dao-memory/src/java/org/sakaiproject/oauth/dao/MemoryAccessorDao.java b/oauth/impl/src/java/org/sakaiproject/oauth/dao/MemoryAccessorDao.java similarity index 100% rename from oauth/dao-memory/src/java/org/sakaiproject/oauth/dao/MemoryAccessorDao.java rename to oauth/impl/src/java/org/sakaiproject/oauth/dao/MemoryAccessorDao.java diff --git a/oauth/dao-memory/src/java/org/sakaiproject/oauth/dao/MemoryConsumerDao.java b/oauth/impl/src/java/org/sakaiproject/oauth/dao/MemoryConsumerDao.java similarity index 100% rename from oauth/dao-memory/src/java/org/sakaiproject/oauth/dao/MemoryConsumerDao.java rename to oauth/impl/src/java/org/sakaiproject/oauth/dao/MemoryConsumerDao.java diff --git a/oauth/dao-server-config/src/java/org/sakaiproject/oauth/dao/ServerConfigConsumerDao.java b/oauth/impl/src/java/org/sakaiproject/oauth/dao/ServerConfigConsumerDao.java similarity index 100% rename from oauth/dao-server-config/src/java/org/sakaiproject/oauth/dao/ServerConfigConsumerDao.java rename to oauth/impl/src/java/org/sakaiproject/oauth/dao/ServerConfigConsumerDao.java diff --git a/oauth/pack/src/webapp/WEB-INF/components.xml b/oauth/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from oauth/pack/src/webapp/WEB-INF/components.xml rename to oauth/impl/src/webapp/WEB-INF/components.xml diff --git a/oauth/pack/pom.xml b/oauth/pack/pom.xml deleted file mode 100755 index b9a519e18778..000000000000 --- a/oauth/pack/pom.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.oauth - oauth-base - 12-SNAPSHOT - - - oauth-pack - sakai-component - - OAuth Component - Spring component defining the Spring configuration for the OAuth project. - - - - ${project.groupId} - oauth-impl - - - ${project.groupId} - oauth-api - - - ${project.groupId} - oauth-dao-memory - - - ${project.groupId} - oauth-dao-hbm - provided - - - ${project.groupId} - oauth-dao-server-config - - - org.springframework - spring-core - provided - - - - diff --git a/oauth/pom.xml b/oauth/pom.xml index 1e19475ab327..309ecc87dbab 100755 --- a/oauth/pom.xml +++ b/oauth/pom.xml @@ -55,9 +55,6 @@ api impl dao-hbm - dao-memory - dao-server-config - pack tool @@ -90,17 +87,17 @@ ${project.groupId} - oauth-dao-hbm + oauth-org.sakaiproject.oauth.dao-hbm ${project.version} ${project.groupId} - oauth-dao-server-config + oauth-org.sakaiproject.oauth.dao-server-config ${project.version} ${project.groupId} - oauth-dao-memory + oauth-org.sakaiproject.oauth.dao-memory ${project.version} diff --git a/pasystem/pasystem-impl/impl/pom.xml b/pasystem/pasystem-impl/impl/pom.xml index cc7b6478b20e..d37a05a88120 100644 --- a/pasystem/pasystem-impl/impl/pom.xml +++ b/pasystem/pasystem-impl/impl/pom.xml @@ -8,7 +8,7 @@ org.sakaiproject.pasystem pasystem-impl - jar + sakai-component pasystem-base @@ -18,7 +18,7 @@ - + components diff --git a/pasystem/pasystem-impl/pack/src/webapp/WEB-INF/components.xml b/pasystem/pasystem-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from pasystem/pasystem-impl/pack/src/webapp/WEB-INF/components.xml rename to pasystem/pasystem-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/pasystem/pasystem-impl/pack/pom.xml b/pasystem/pasystem-impl/pack/pom.xml deleted file mode 100644 index 1ba6a05b3336..000000000000 --- a/pasystem/pasystem-impl/pack/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - pasystem-base - org.sakaiproject.pasystem - 12-SNAPSHOT - ../../pom.xml - - pasystem-pack - org.sakaiproject.pasystem - pasystem-pack - sakai-component - - components - - - - org.sakaiproject.pasystem - pasystem-impl - ${project.version} - - - org.apache.commons - commons-lang3 - compile - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - - - diff --git a/pasystem/pom.xml b/pasystem/pom.xml index bc808937a3a6..6224f7ccc85d 100644 --- a/pasystem/pom.xml +++ b/pasystem/pom.xml @@ -20,7 +20,6 @@ pasystem-api/api pasystem-impl/impl - pasystem-impl/pack pasystem-tool/tool diff --git a/podcasts/pack/pom.xml b/podcasts/pack/pom.xml deleted file mode 100644 index a5f4f2daf408..000000000000 --- a/podcasts/pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - podcasts-base - org.sakaiproject - 12-SNAPSHOT - ../pom.xml - - sakai-podcasts-pack - org.sakaiproject - sakai-podcasts-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject - sakai-podcasts-impl - - - - - - - diff --git a/podcasts/podcasts-impl/pom.xml b/podcasts/podcasts-impl/pom.xml index 12e994046237..0036b5f95230 100644 --- a/podcasts/podcasts-impl/pom.xml +++ b/podcasts/podcasts-impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2004 - jar + sakai-component - + components @@ -56,8 +56,4 @@ 0.3.2 - - - impl/src/java - diff --git a/podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java b/podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java similarity index 100% rename from podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java rename to podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java diff --git a/podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/PodcastComparator.java b/podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/PodcastComparator.java similarity index 100% rename from podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/PodcastComparator.java rename to podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/PodcastComparator.java diff --git a/podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/PodcastPermissionsServiceImpl.java b/podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/PodcastPermissionsServiceImpl.java similarity index 100% rename from podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/PodcastPermissionsServiceImpl.java rename to podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/PodcastPermissionsServiceImpl.java diff --git a/podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/PodcastServiceImpl.java b/podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/PodcastServiceImpl.java similarity index 100% rename from podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/PodcastServiceImpl.java rename to podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/PodcastServiceImpl.java diff --git a/podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/Utilities.java b/podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/Utilities.java similarity index 100% rename from podcasts/podcasts-impl/impl/src/java/org/sakaiproject/component/app/podcasts/Utilities.java rename to podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/Utilities.java diff --git a/podcasts/pack/src/webapp/WEB-INF/components.xml b/podcasts/podcasts-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from podcasts/pack/src/webapp/WEB-INF/components.xml rename to podcasts/podcasts-impl/src/webapp/WEB-INF/components.xml diff --git a/podcasts/pom.xml b/podcasts/pom.xml index 309c96d80f34..eba8f6f9727a 100644 --- a/podcasts/pom.xml +++ b/podcasts/pom.xml @@ -12,7 +12,6 @@ podcasts-base pom - pack podcasts podcasts-api podcasts-app diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml index f68a0ea2986f..8672123ccbdb 100644 --- a/polls/impl/pom.xml +++ b/polls/impl/pom.xml @@ -11,11 +11,14 @@ Sakai Polls Implementation Module (polls-impl) org.sakaiproject.polls polls-impl - jar + sakai-component This project provides the implementation used by the Sakai Poll Tool. + + components + diff --git a/polls/pack/src/webapp/WEB-INF/components.xml b/polls/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from polls/pack/src/webapp/WEB-INF/components.xml rename to polls/impl/src/webapp/WEB-INF/components.xml diff --git a/polls/pack/src/webapp/WEB-INF/hibernate-hbms.xml b/polls/impl/src/webapp/WEB-INF/hibernate-hbms.xml similarity index 100% rename from polls/pack/src/webapp/WEB-INF/hibernate-hbms.xml rename to polls/impl/src/webapp/WEB-INF/hibernate-hbms.xml diff --git a/polls/pack/pom.xml b/polls/pack/pom.xml deleted file mode 100644 index cfad0af7315f..000000000000 --- a/polls/pack/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.polls - polls - 12-SNAPSHOT - - - Sakai Polls Component Package (polls-pack) - org.sakaiproject.polls - polls-pack - sakai-component - - - This project creates the pack used by the Sakai Poll Tool - - - - components - - - - - ${project.groupId} - polls-impl - - - diff --git a/polls/pom.xml b/polls/pom.xml index 98258108579f..18f01b56b85b 100644 --- a/polls/pom.xml +++ b/polls/pom.xml @@ -26,7 +26,6 @@ api impl - pack tool diff --git a/portal/pom.xml b/portal/pom.xml index 790b59abc93f..976f0924b551 100644 --- a/portal/pom.xml +++ b/portal/pom.xml @@ -24,11 +24,8 @@ portal-render-api/api portal-render-impl/impl - portal-render-impl/pack portal-render-engine-impl/impl - portal-render-engine-impl/pack portal-service-impl/impl - portal-service-impl/pack portal-shared-deploy portal-tool/tool portal-util/util diff --git a/portal/portal-render-engine-impl/impl/pom.xml b/portal/portal-render-engine-impl/impl/pom.xml index 795d1a74b6d4..e0da9ced7cc9 100644 --- a/portal/portal-render-engine-impl/impl/pom.xml +++ b/portal/portal-render-engine-impl/impl/pom.xml @@ -17,7 +17,7 @@ http://sakaiproject.org/ 2003 - jar + war @@ -71,9 +71,28 @@ jtidy jtidy + + httpunit + httpunit + 1.6.2 + test + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + **/AnonPortalTest.java + + + + ${basedir}/src/bundle @@ -98,6 +117,13 @@ **/* + + ${basedir}/src/webapp + + **/*.* + + + diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockCharonPortal.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockCharonPortal.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockCharonPortal.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockCharonPortal.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockHttpServletRequest.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockHttpServletRequest.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockHttpServletRequest.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockHttpServletRequest.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockResourceLoader.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockResourceLoader.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockResourceLoader.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockResourceLoader.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockSession.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockSession.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockSession.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockSession.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockToolSession.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockToolSession.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/MockToolSession.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/MockToolSession.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/PortalRenderTest.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/PortalRenderTest.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/PortalRenderTest.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/PortalRenderTest.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/PortalTestFileUtils.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/PortalTestFileUtils.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/PortalTestFileUtils.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/PortalTestFileUtils.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/TestClasspathResourceLoader.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/TestClasspathResourceLoader.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/TestClasspathResourceLoader.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/TestClasspathResourceLoader.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/http/ActionHandler.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/http/ActionHandler.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/http/ActionHandler.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/http/ActionHandler.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/http/AnonPortalTest.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/http/AnonPortalTest.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/http/AnonPortalTest.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/http/AnonPortalTest.java diff --git a/portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/http/LoginActionHandler.java b/portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/http/LoginActionHandler.java similarity index 100% rename from portal/portal-render-engine-impl/pack/src/test/org/sakaiproject/portal/charon/test/http/LoginActionHandler.java rename to portal/portal-render-engine-impl/impl/src/test/org/sakaiproject/portal/charon/test/http/LoginActionHandler.java diff --git a/portal/portal-render-engine-impl/pack/src/testBundle/log4j.properties b/portal/portal-render-engine-impl/impl/src/testBundle/log4j.properties similarity index 100% rename from portal/portal-render-engine-impl/pack/src/testBundle/log4j.properties rename to portal/portal-render-engine-impl/impl/src/testBundle/log4j.properties diff --git a/portal/portal-render-engine-impl/pack/src/testBundle/testportalvelocity.config b/portal/portal-render-engine-impl/impl/src/testBundle/testportalvelocity.config similarity index 100% rename from portal/portal-render-engine-impl/pack/src/testBundle/testportalvelocity.config rename to portal/portal-render-engine-impl/impl/src/testBundle/testportalvelocity.config diff --git a/portal/portal-render-engine-impl/pack/src/webapp/WEB-INF/web.xml b/portal/portal-render-engine-impl/impl/src/webapp/WEB-INF/web.xml similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/WEB-INF/web.xml rename to portal/portal-render-engine-impl/impl/src/webapp/WEB-INF/web.xml diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/atom.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/atom.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/atom.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/atom.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/error.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/error.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/error.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/error.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeAnalytics.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeAnalytics.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeAnalytics.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeAnalytics.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeCookieNotice.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeCookieNotice.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeCookieNotice.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeCookieNotice.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeFooter.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeFooter.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeFooter.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeFooter.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeFooterExtras.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeFooterExtras.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeFooterExtras.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeFooterExtras.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeGoogleTagManager.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeGoogleTagManager.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeGoogleTagManager.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeGoogleTagManager.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeLoginNav.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeLoginNav.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeLoginNav.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeLoginNav.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePASystem.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePASystem.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePASystem.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePASystem.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePage.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePage.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePage.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePage.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageBody.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePageBody.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageBody.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePageBody.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageNav.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePageNav.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageNav.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePageNav.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageWithNav.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePageWithNav.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includePageWithNav.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includePageWithNav.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeSitesNav.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeSitesNav.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeSitesNav.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeSitesNav.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeStandardHead.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeStandardHead.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeTabs.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeTabs.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeTabs.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeTabs.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeToggleNav.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeToggleNav.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeToggleNav.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeToggleNav.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeToolBody.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeToolBody.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/includeToolBody.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeToolBody.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/join.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/join.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/join.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/join.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/login.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/login.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/login.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/login.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/macros.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/macros.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/macros.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/macros.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/moresites.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/moresites.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/moresites.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/moresites.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/opml.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/opml.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/opml.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/opml.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/page.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/page.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/page.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/page.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/portal-redirect.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/portal-redirect.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/portal-redirect.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/portal-redirect.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/rss.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/rss.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/rss.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/rss.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/site.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/site.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/site.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/header-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/header-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/header-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/header-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/loginForm-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/loginForm-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/loginForm-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/loginForm-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/loginImage-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/loginImage-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/loginImage-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/loginImage-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/portalCSS-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/portalCSS-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/portalCSS-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/portalCSS-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/portalChat-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/portalChat-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/portalChat-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/portalChat-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/roleSwitch-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/roleSwitch-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/roleSwitch-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/roleSwitch-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/siteStatus-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/siteStatus-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/siteStatus-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/siteStatus-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/skipNav-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/skipNav-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/skipNav-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/skipNav-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/styleable-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/styleable-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/styleable-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/styleable-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/title-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/title-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/title-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/title-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/toolBody-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/toolBody-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/toolBody-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/toolBody-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/worksite-snippet.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/worksite-snippet.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/snippets/worksite-snippet.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/snippets/worksite-snippet.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/timeout.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/timeout.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/timeout.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/timeout.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/tool.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/tool.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/tool.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/tool.vm diff --git a/portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/worksite.vm b/portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/worksite.vm similarity index 100% rename from portal/portal-render-engine-impl/pack/src/webapp/vm/morpheus/worksite.vm rename to portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/worksite.vm diff --git a/portal/portal-render-engine-impl/pack/pom.xml b/portal/portal-render-engine-impl/pack/pom.xml index b10da4e93705..4079d312465d 100644 --- a/portal/portal-render-engine-impl/pack/pom.xml +++ b/portal/portal-render-engine-impl/pack/pom.xml @@ -49,12 +49,7 @@ sakai-portal-util test - - httpunit - httpunit - 1.6.2 - test - + javax.servlet servlet-api diff --git a/portal/portal-render-impl/impl/pom.xml b/portal/portal-render-impl/impl/pom.xml index 8effa758ab95..8fa83efa9450 100644 --- a/portal/portal-render-impl/impl/pom.xml +++ b/portal/portal-render-impl/impl/pom.xml @@ -17,7 +17,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component + + components + diff --git a/portal/portal-render-impl/pack/src/webapp/WEB-INF/components.xml b/portal/portal-render-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from portal/portal-render-impl/pack/src/webapp/WEB-INF/components.xml rename to portal/portal-render-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/portal/portal-render-impl/pack/pom.xml b/portal/portal-render-impl/pack/pom.xml deleted file mode 100644 index b8624d3504b6..000000000000 --- a/portal/portal-render-impl/pack/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - portal - org.sakaiproject.portal - 12-SNAPSHOT - ../../pom.xml - - - sakai-portal-render-pack - org.sakaiproject.portal - sakai-portal-render-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-portal-render-impl - - - - - - src/java - - diff --git a/portal/portal-service-impl/impl/pom.xml b/portal/portal-service-impl/impl/pom.xml index c1cca682bcc1..bf472d8587e5 100644 --- a/portal/portal-service-impl/impl/pom.xml +++ b/portal/portal-service-impl/impl/pom.xml @@ -17,7 +17,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component + + components + diff --git a/portal/portal-service-impl/pack/src/webapp/WEB-INF/components.xml b/portal/portal-service-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from portal/portal-service-impl/pack/src/webapp/WEB-INF/components.xml rename to portal/portal-service-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/portal/portal-service-impl/pack/pom.xml b/portal/portal-service-impl/pack/pom.xml deleted file mode 100644 index 1e296c1ef031..000000000000 --- a/portal/portal-service-impl/pack/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - - portal - org.sakaiproject.portal - 12-SNAPSHOT - ../../pom.xml - - - sakai-portal-service-pack - org.sakaiproject.portal - sakai-portal-service-pack - - University of Cambridge - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-portal-service-impl - - - - - - src/java - - diff --git a/postem/components/pom.xml b/postem/components/pom.xml deleted file mode 100644 index d35e6a0fef67..000000000000 --- a/postem/components/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - postem-base - org.sakaiproject - 12-SNAPSHOT - ../pom.xml - - sakai-postem-pack - org.sakaiproject - sakai-postem-pack - - Sakai Project - http://sakaiproject.org/ - - 2004 - sakai-component - - components - - - - org.sakaiproject - sakai-postem-impl - - - org.sakaiproject - sakai-postem-hbm - - - - - - - - src/java - - **/*.xml - - - - - diff --git a/postem/pom.xml b/postem/pom.xml index 6e0b55dcc3f6..705cd93fb968 100644 --- a/postem/pom.xml +++ b/postem/pom.xml @@ -14,7 +14,6 @@ pom - components postem-api postem-app postem-hbm diff --git a/postem/postem-impl/pom.xml b/postem/postem-impl/pom.xml index 6733e72bb006..a6f483052c4e 100644 --- a/postem/postem-impl/pom.xml +++ b/postem/postem-impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2004 - jar + sakai-component - + components diff --git a/postem/components/src/webapp/WEB-INF/components.xml b/postem/postem-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from postem/components/src/webapp/WEB-INF/components.xml rename to postem/postem-impl/src/webapp/WEB-INF/components.xml diff --git a/presence/pom.xml b/presence/pom.xml index 3e5e348fbbc4..d05282faf8be 100644 --- a/presence/pom.xml +++ b/presence/pom.xml @@ -17,7 +17,6 @@ presence-api/api presence-impl/impl - presence-impl/pack presence-tool/tool presence-util/util diff --git a/presence/presence-impl/impl/pom.xml b/presence/presence-impl/impl/pom.xml index a08701be47ab..e9e5e4fcb208 100644 --- a/presence/presence-impl/impl/pom.xml +++ b/presence/presence-impl/impl/pom.xml @@ -17,7 +17,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component + + components + diff --git a/presence/presence-impl/pack/src/webapp/WEB-INF/components.xml b/presence/presence-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from presence/presence-impl/pack/src/webapp/WEB-INF/components.xml rename to presence/presence-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/presence/presence-impl/pack/pom.xml b/presence/presence-impl/pack/pom.xml deleted file mode 100644 index eb99e755464e..000000000000 --- a/presence/presence-impl/pack/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.presence - presence - 12-SNAPSHOT - ../../pom.xml - - - sakai-presence-pack - org.sakaiproject.presence - sakai-presence-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-presence-impl - - - diff --git a/profile2/impl/pom.xml b/profile2/impl/pom.xml index 5e6a8589666c..8e9835eddfd7 100644 --- a/profile2/impl/pom.xml +++ b/profile2/impl/pom.xml @@ -5,13 +5,16 @@ org.sakaiproject.profile2 profile2-impl - jar + sakai-component org.sakaiproject.profile2 profile2 12-SNAPSHOT + + components + diff --git a/profile2/pack/src/webapp/WEB-INF/components.xml b/profile2/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from profile2/pack/src/webapp/WEB-INF/components.xml rename to profile2/impl/src/webapp/WEB-INF/components.xml diff --git a/profile2/pack/pom.xml b/profile2/pack/pom.xml deleted file mode 100644 index baaeca7dea2f..000000000000 --- a/profile2/pack/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - Profile2 PACK - org.sakaiproject.profile2 - profile2-pack - - sakai-component - - - org.sakaiproject.profile2 - profile2 - 12-SNAPSHOT - - - - components - - - - - org.sakaiproject.profile2 - profile2-impl - - - - - - diff --git a/profile2/pom.xml b/profile2/pom.xml index 15c47bc76ca7..cafdcfc6e0af 100644 --- a/profile2/pom.xml +++ b/profile2/pom.xml @@ -25,7 +25,6 @@ api impl util - pack tool bundle diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml index 306da2c5483f..5d440a1d8cd9 100644 --- a/reset-pass/account-validator-impl/pom.xml +++ b/reset-pass/account-validator-impl/pom.xml @@ -10,9 +10,9 @@ 2007 Account Validator implementation - jar + sakai-component - + components diff --git a/reset-pass/account-validator-pack/src/webapp/WEB-INF/components.xml b/reset-pass/account-validator-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from reset-pass/account-validator-pack/src/webapp/WEB-INF/components.xml rename to reset-pass/account-validator-impl/src/webapp/WEB-INF/components.xml diff --git a/reset-pass/account-validator-pack/src/webapp/WEB-INF/hibernate-hbms.xml b/reset-pass/account-validator-impl/src/webapp/WEB-INF/hibernate-hbms.xml similarity index 100% rename from reset-pass/account-validator-pack/src/webapp/WEB-INF/hibernate-hbms.xml rename to reset-pass/account-validator-impl/src/webapp/WEB-INF/hibernate-hbms.xml diff --git a/reset-pass/account-validator-pack/src/webapp/WEB-INF/spring-hibernate.xml b/reset-pass/account-validator-impl/src/webapp/WEB-INF/spring-hibernate.xml similarity index 100% rename from reset-pass/account-validator-pack/src/webapp/WEB-INF/spring-hibernate.xml rename to reset-pass/account-validator-impl/src/webapp/WEB-INF/spring-hibernate.xml diff --git a/reset-pass/account-validator-pack/pom.xml b/reset-pass/account-validator-pack/pom.xml deleted file mode 100644 index b8d48d6bc8c8..000000000000 --- a/reset-pass/account-validator-pack/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - 4.0.0 - Sakai Account Validator Components Pack - org.sakaiproject.accountvalidator - accountvalidator-pack - - Sakai Project - http://sakaiproject.org/ - - 2007 - Qna components pack (special Sakai convention) - sakai-component - - - components - - - - - org.sakaiproject.reset-pass - reset-pass - 12-SNAPSHOT - - - - - - - org.sakaiproject.accountvalidator - accountvalidator-impl - ${project.version} - runtime - - - - - - - diff --git a/reset-pass/pom.xml b/reset-pass/pom.xml index 06ec48d055cd..8ee42e9b4f3f 100644 --- a/reset-pass/pom.xml +++ b/reset-pass/pom.xml @@ -17,7 +17,6 @@ reset-pass account-validator-api account-validator-impl - account-validator-pack account-validator-tool diff --git a/rights/pom.xml b/rights/pom.xml index fa8abc180cbe..a0b6d4773442 100644 --- a/rights/pom.xml +++ b/rights/pom.xml @@ -15,7 +15,6 @@ rights-api/api rights-impl/impl - rights-impl/pack rights-tool/tool diff --git a/rights/rights-impl/impl/pom.xml b/rights/rights-impl/impl/pom.xml index 5680b9fabfb5..6667f1c4364a 100644 --- a/rights/rights-impl/impl/pom.xml +++ b/rights/rights-impl/impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2003 - jar + sakai-component - + components diff --git a/rights/rights-impl/pack/src/webapp/WEB-INF/components.xml b/rights/rights-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from rights/rights-impl/pack/src/webapp/WEB-INF/components.xml rename to rights/rights-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/rights/rights-impl/pack/pom.xml b/rights/rights-impl/pack/pom.xml deleted file mode 100644 index 934988a7e067..000000000000 --- a/rights/rights-impl/pack/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - rights-base - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - sakai-rights-pack - org.sakaiproject - sakai-rights-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject.kernel - sakai-kernel-util - - - - - - - org.sakaiproject - sakai-rights-impl - ${project.version} - - - - - - - - - - - - diff --git a/rwiki/pom.xml b/rwiki/pom.xml index 776dc20de4e8..bafe09d78fbc 100644 --- a/rwiki/pom.xml +++ b/rwiki/pom.xml @@ -35,7 +35,6 @@ limitations under the License. rwiki-util/jrcs rwiki-util/radeox rwiki-util/util - rwiki-impl/pack rwiki-tool/tool rwiki-access-tool diff --git a/rwiki/rwiki-impl/impl/pom.xml b/rwiki/rwiki-impl/impl/pom.xml index e6a6d80a8890..f182028ce2b6 100644 --- a/rwiki/rwiki-impl/impl/pom.xml +++ b/rwiki/rwiki-impl/impl/pom.xml @@ -10,9 +10,9 @@ sakai-rwiki-impl org.sakaiproject sakai-rwiki-impl - jar + sakai-component - + components diff --git a/rwiki/rwiki-impl/pack/src/bundle/META-INF/services/org.radeox.macro.Macro b/rwiki/rwiki-impl/impl/src/bundle/services/org.radeox.macro.Macro similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/META-INF/services/org.radeox.macro.Macro rename to rwiki/rwiki-impl/impl/src/bundle/services/org.radeox.macro.Macro diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051017.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051017.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051017.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051017.sql diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051026.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051026.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051026.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051026.sql diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051107.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051107.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051107.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/hsqldb/migrateTo20051107.sql diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051017.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051017.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051017.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051017.sql diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051026.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051026.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051026.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051026.sql diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051107.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051107.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051107.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/mysql/migrateTo20051107.sql diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051017.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051017.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051017.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051017.sql diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051026.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051026.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051026.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051026.sql diff --git a/rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051107.sql b/rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051107.sql similarity index 100% rename from rwiki/rwiki-impl/pack/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051107.sql rename to rwiki/rwiki-impl/impl/src/bundle/uk/ac/cam/caret/sakai/rwiki/model/bundle/oracle/migrateTo20051107.sql diff --git a/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/components.xml b/rwiki/rwiki-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from rwiki/rwiki-impl/pack/src/webapp/WEB-INF/components.xml rename to rwiki/rwiki-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/coreDaoComponents.xml b/rwiki/rwiki-impl/impl/src/webapp/WEB-INF/coreDaoComponents.xml similarity index 100% rename from rwiki/rwiki-impl/pack/src/webapp/WEB-INF/coreDaoComponents.xml rename to rwiki/rwiki-impl/impl/src/webapp/WEB-INF/coreDaoComponents.xml diff --git a/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/coreServiceComponents.xml b/rwiki/rwiki-impl/impl/src/webapp/WEB-INF/coreServiceComponents.xml similarity index 100% rename from rwiki/rwiki-impl/pack/src/webapp/WEB-INF/coreServiceComponents.xml rename to rwiki/rwiki-impl/impl/src/webapp/WEB-INF/coreServiceComponents.xml diff --git a/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/datamigrationComponents.xml b/rwiki/rwiki-impl/impl/src/webapp/WEB-INF/datamigrationComponents.xml similarity index 100% rename from rwiki/rwiki-impl/pack/src/webapp/WEB-INF/datamigrationComponents.xml rename to rwiki/rwiki-impl/impl/src/webapp/WEB-INF/datamigrationComponents.xml diff --git a/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/messagingComponents.xml b/rwiki/rwiki-impl/impl/src/webapp/WEB-INF/messagingComponents.xml similarity index 100% rename from rwiki/rwiki-impl/pack/src/webapp/WEB-INF/messagingComponents.xml rename to rwiki/rwiki-impl/impl/src/webapp/WEB-INF/messagingComponents.xml diff --git a/rwiki/rwiki-impl/pack/src/webapp/WEB-INF/rwikiAdapterComponents.xml b/rwiki/rwiki-impl/impl/src/webapp/WEB-INF/rwikiAdapterComponents.xml similarity index 100% rename from rwiki/rwiki-impl/pack/src/webapp/WEB-INF/rwikiAdapterComponents.xml rename to rwiki/rwiki-impl/impl/src/webapp/WEB-INF/rwikiAdapterComponents.xml diff --git a/rwiki/rwiki-impl/pack/pom.xml b/rwiki/rwiki-impl/pack/pom.xml deleted file mode 100644 index e1f8ba640e49..000000000000 --- a/rwiki/rwiki-impl/pack/pom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - 4.0.0 - - rwiki-base - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - sakai-rwiki-pack - org.sakaiproject - sakai-rwiki-pack - - Deployment of components - - sakai-component - - components - - - - - ${basedir}/src/bundle - - **/*.* - - false - - - ${basedir}/src/java - - **/*.xml - - false - - - - - - ${basedir}/src/testBundle - - **/*.* - - false - - - - - - - - org.sakaiproject - sakai-rwiki-impl - jar - - - org.sakaiproject - sakai-rwiki-model - - - - - xerces - xmlParserAPIs - - - xerces - xercesImpl - - - xalan - xalan - - - diff --git a/search/elasticsearch/impl/pom.xml b/search/elasticsearch/impl/pom.xml index 120ceff4a8e0..7dccb2df9fd9 100644 --- a/search/elasticsearch/impl/pom.xml +++ b/search/elasticsearch/impl/pom.xml @@ -11,7 +11,11 @@ elasticsearch-impl org.sakaiproject.search.elasticsearch Sakai search - ElasticSearch impl - jar + sakai-component + + + components + diff --git a/search/elasticsearch/pack/src/webapp/WEB-INF/components.xml b/search/elasticsearch/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from search/elasticsearch/pack/src/webapp/WEB-INF/components.xml rename to search/elasticsearch/impl/src/webapp/WEB-INF/components.xml diff --git a/search/elasticsearch/pack/pom.xml b/search/elasticsearch/pack/pom.xml deleted file mode 100644 index 60cd996fe0b0..000000000000 --- a/search/elasticsearch/pack/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - 4.0.0 - - org.sakaiproject.search.elasticsearch - elasticsearch-base - 12-SNAPSHOT - ../pom.xml - - elasticsearch-component - org.sakaiproject.search.elasticsearch - Sakai search - ElasticSearch component - sakai-component - - components - - - - org.elasticsearch - elasticsearch - provided - - - org.sakaiproject.search.elasticsearch - elasticsearch-impl - ${project.version} - - - org.sakaiproject.search - search-api - provided - - - org.sakaiproject.entitybroker - entitybroker-utils - - - org.springframework - spring-core - provided - - - diff --git a/search/elasticsearch/pom.xml b/search/elasticsearch/pom.xml index 9078b837e546..000dc6b5e0d4 100644 --- a/search/elasticsearch/pom.xml +++ b/search/elasticsearch/pom.xml @@ -25,7 +25,6 @@ impl - pack diff --git a/search/pom.xml b/search/pom.xml index 0ef450602384..8919846dffe4 100644 --- a/search/pom.xml +++ b/search/pom.xml @@ -17,7 +17,6 @@ search-api/api search-test search-impl/impl - search-impl/pack search-model search-util search-tool/tool diff --git a/search/search-impl/impl/pom.xml b/search/search-impl/impl/pom.xml index b5670f12c2f8..651e58b984c4 100644 --- a/search/search-impl/impl/pom.xml +++ b/search/search-impl/impl/pom.xml @@ -10,7 +10,11 @@ search-impl org.sakaiproject.search search-impl - jar + sakai-component + + + components + diff --git a/search/search-impl/pack/src/webapp/WEB-INF/components.xml b/search/search-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from search/search-impl/pack/src/webapp/WEB-INF/components.xml rename to search/search-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/search/search-impl/pack/src/webapp/WEB-INF/contentAdapterComponents.xml b/search/search-impl/impl/src/webapp/WEB-INF/contentAdapterComponents.xml similarity index 100% rename from search/search-impl/pack/src/webapp/WEB-INF/contentAdapterComponents.xml rename to search/search-impl/impl/src/webapp/WEB-INF/contentAdapterComponents.xml diff --git a/search/search-impl/pack/src/webapp/WEB-INF/siteAdapterComponents.xml b/search/search-impl/impl/src/webapp/WEB-INF/siteAdapterComponents.xml similarity index 100% rename from search/search-impl/pack/src/webapp/WEB-INF/siteAdapterComponents.xml rename to search/search-impl/impl/src/webapp/WEB-INF/siteAdapterComponents.xml diff --git a/search/search-impl/pack/pom.xml b/search/search-impl/pack/pom.xml deleted file mode 100644 index b4f76dd80461..000000000000 --- a/search/search-impl/pack/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - 4.0.0 - - search - org.sakaiproject.search - 12-SNAPSHOT - ../../pom.xml - - search-pack - org.sakaiproject.search - search-pack - sakai-component - - components - - - - - ${basedir}/src/bundle - - **/*.* - - false - - - ${basedir}/src/java - - **/*.xml - - false - - - - - - ${basedir}/src/testBundle - - **/*.* - - false - - - - - - - - org.sakaiproject.search - search-impl - jar - - - - diff --git a/shortenedurl/impl/pom.xml b/shortenedurl/impl/pom.xml index fb99decdbd54..edd3411521a6 100755 --- a/shortenedurl/impl/pom.xml +++ b/shortenedurl/impl/pom.xml @@ -6,10 +6,10 @@ org.sakaiproject.shortenedurl shortenedurl-impl - jar + sakai-component - + components diff --git a/shortenedurl/pack/src/webapp/WEB-INF/components.xml b/shortenedurl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from shortenedurl/pack/src/webapp/WEB-INF/components.xml rename to shortenedurl/impl/src/webapp/WEB-INF/components.xml diff --git a/shortenedurl/pack/pom.xml b/shortenedurl/pack/pom.xml deleted file mode 100755 index 078bbf72808d..000000000000 --- a/shortenedurl/pack/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - Sakai Shortened URL Service Pack - org.sakaiproject.shortenedurl - shortenedurl-pack - - sakai-component - - - org.sakaiproject.shortenedurl - shortenedurl - 12-SNAPSHOT - - - - components - - - - - - - - org.sakaiproject.shortenedurl - shortenedurl-impl - - - - - - - diff --git a/shortenedurl/pom.xml b/shortenedurl/pom.xml index 3b425dc0df37..eb7d4acb485d 100755 --- a/shortenedurl/pom.xml +++ b/shortenedurl/pom.xml @@ -44,7 +44,6 @@ api impl - pack tool diff --git a/signup/impl/pom.xml b/signup/impl/pom.xml index deda997ce2d7..29823a5feefc 100644 --- a/signup/impl/pom.xml +++ b/signup/impl/pom.xml @@ -12,7 +12,10 @@ Sakai Signup Implementation org.sakaiproject.signup signup-impl - jar + sakai-component + + components + diff --git a/signup/pack/src/webapp/WEB-INF/components.xml b/signup/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from signup/pack/src/webapp/WEB-INF/components.xml rename to signup/impl/src/webapp/WEB-INF/components.xml diff --git a/signup/pack/src/webapp/WEB-INF/hibernate-hbms.xml b/signup/impl/src/webapp/WEB-INF/hibernate-hbms.xml similarity index 100% rename from signup/pack/src/webapp/WEB-INF/hibernate-hbms.xml rename to signup/impl/src/webapp/WEB-INF/hibernate-hbms.xml diff --git a/signup/pack/src/webapp/WEB-INF/spring-hibernate.xml b/signup/impl/src/webapp/WEB-INF/spring-hibernate.xml similarity index 100% rename from signup/pack/src/webapp/WEB-INF/spring-hibernate.xml rename to signup/impl/src/webapp/WEB-INF/spring-hibernate.xml diff --git a/signup/pack/pom.xml b/signup/pack/pom.xml deleted file mode 100644 index 63fcc53aa964..000000000000 --- a/signup/pack/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.signup - signup - 12-SNAPSHOT - - - Sakai Signup Components Pack - org.sakaiproject.signup - signup-pack - sakai-component - - - components - - - - - org.sakaiproject.signup - signup-impl - - - org.sakaiproject.kernel - sakai-kernel-util - - - - - - diff --git a/signup/pom.xml b/signup/pom.xml index 99b3222c510e..f9b6c04920e2 100644 --- a/signup/pom.xml +++ b/signup/pom.xml @@ -47,7 +47,6 @@ api impl - pack tool diff --git a/site-manage/pom.xml b/site-manage/pom.xml index 5ca5912f90f8..c8d4356bc3fc 100644 --- a/site-manage/pom.xml +++ b/site-manage/pom.xml @@ -21,7 +21,6 @@ site-association-api/api site-association-hbm/hbm site-association-impl/impl - site-association-impl/pack site-association-tool/tool site-association-util/util site-manage-api/api @@ -45,13 +44,11 @@ site-association-api/api site-association-hbm/hbm site-association-impl/impl - site-association-impl/pack site-association-tool/tool site-association-util/util site-manage-api/api site-manage-hbm site-manage-impl/impl - site-manage-impl/pack site-manage-tool/tool site-manage-util/util site-manage-group-helper/tool diff --git a/site-manage/site-manage-impl/impl/pom.xml b/site-manage/site-manage-impl/impl/pom.xml index 5146e00e2e0f..4c2d9b42c7ae 100644 --- a/site-manage/site-manage-impl/impl/pom.xml +++ b/site-manage/site-manage-impl/impl/pom.xml @@ -17,7 +17,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component + + components + diff --git a/site-manage/site-manage-impl/pack/src/webapp/WEB-INF/components.xml b/site-manage/site-manage-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from site-manage/site-manage-impl/pack/src/webapp/WEB-INF/components.xml rename to site-manage/site-manage-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/site-manage/site-manage-impl/pack/pom.xml b/site-manage/site-manage-impl/pack/pom.xml deleted file mode 100644 index 5cb7189afb13..000000000000 --- a/site-manage/site-manage-impl/pack/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.sitemanage - sitemanage - 12-SNAPSHOT - ../../pom.xml - - - sakai-site-manage-pack - org.sakaiproject.sitemanage - sakai-site-manage-pack - - University of Michigan - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-site-manage-impl - - - - - - - ${basedir}/src/bundle - - **/*.properties - - - - - diff --git a/sitestats/pom.xml b/sitestats/pom.xml index 2237fd6c417a..99127412f118 100644 --- a/sitestats/pom.xml +++ b/sitestats/pom.xml @@ -38,7 +38,6 @@ sitestats-bundle sitestats-impl sitestats-impl-hib - sitestats-pack sitestats-tool diff --git a/sitestats/sitestats-impl/pom.xml b/sitestats/sitestats-impl/pom.xml index 4448f34fdcfa..0e7b1504f9c8 100644 --- a/sitestats/sitestats-impl/pom.xml +++ b/sitestats/sitestats-impl/pom.xml @@ -18,7 +18,10 @@ - jar + sakai-component + + components + diff --git a/sitestats/sitestats-pack/src/webapp/WEB-INF/components.xml b/sitestats/sitestats-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from sitestats/sitestats-pack/src/webapp/WEB-INF/components.xml rename to sitestats/sitestats-impl/src/webapp/WEB-INF/components.xml diff --git a/syllabus/components/hibernate.properties b/syllabus/components/hibernate.properties deleted file mode 100644 index 74e9dddf0773..000000000000 --- a/syllabus/components/hibernate.properties +++ /dev/null @@ -1,8 +0,0 @@ -#hibernate.dialect=org.hibernate.dialect.HSQLDialect -#hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.dialect=org.hibernate.dialect.Oracle9Dialect -hibernate.show_sql=true -hibernate.query.substitutions=true 1, false 0, yes 'Y', no 'N' -hibernate.jdbc.use_streams_for_binary=true -hibernate.cache.use_query_cache=true -hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider diff --git a/syllabus/components/pom.xml b/syllabus/components/pom.xml deleted file mode 100644 index 9e972590ad85..000000000000 --- a/syllabus/components/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - syllabus-base - org.sakaiproject - 12-SNAPSHOT - ../pom.xml - - sakai-syllabus-pack - org.sakaiproject - sakai-syllabus-pack - - Sakai Project - http://sakaiproject.org/ - - 2004 - sakai-component - - components - - - - org.sakaiproject.kernel - sakai-kernel-util - - - - - - org.sakaiproject - sakai-syllabus-impl - - - org.sakaiproject - sakai-syllabus-hbm - - - - - commons-codec - commons-codec - - - - - - diff --git a/syllabus/pom.xml b/syllabus/pom.xml index f32a904a0466..dc85dd41dc91 100644 --- a/syllabus/pom.xml +++ b/syllabus/pom.xml @@ -13,7 +13,6 @@ pom - components syllabus-api syllabus-app syllabus-hbm diff --git a/syllabus/syllabus-impl/pom.xml b/syllabus/syllabus-impl/pom.xml index be0a47631e2b..63de4b5d8e52 100644 --- a/syllabus/syllabus-impl/pom.xml +++ b/syllabus/syllabus-impl/pom.xml @@ -16,9 +16,9 @@ http://sakaiproject.org/ 2004 - jar + sakai-component - + components diff --git a/syllabus/components/src/webapp/WEB-INF/components.xml b/syllabus/syllabus-impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from syllabus/components/src/webapp/WEB-INF/components.xml rename to syllabus/syllabus-impl/src/webapp/WEB-INF/components.xml diff --git a/taggable/pom.xml b/taggable/pom.xml index 319bc8285942..10244ae720cb 100644 --- a/taggable/pom.xml +++ b/taggable/pom.xml @@ -18,7 +18,6 @@ taggable-api/api taggable-hbm/hbm taggable-impl/impl - taggable-impl/pack diff --git a/taggable/taggable-impl/impl/pom.xml b/taggable/taggable-impl/impl/pom.xml index a929da8a6a5a..2d4b8d98d78e 100644 --- a/taggable/taggable-impl/impl/pom.xml +++ b/taggable/taggable-impl/impl/pom.xml @@ -17,7 +17,10 @@ http://sakaiproject.org/ 2003 - jar + sakai-component + + components + diff --git a/taggable/taggable-impl/pack/src/webapp/WEB-INF/components.xml b/taggable/taggable-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from taggable/taggable-impl/pack/src/webapp/WEB-INF/components.xml rename to taggable/taggable-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/taggable/taggable-impl/pack/pom.xml b/taggable/taggable-impl/pack/pom.xml deleted file mode 100644 index 55fe31c84d2a..000000000000 --- a/taggable/taggable-impl/pack/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - - org.sakaiproject.taggable - taggable - 12-SNAPSHOT - ../../pom.xml - - - sakai-taggable-pack - org.sakaiproject.taggable - sakai-taggable-pack - - The Sakai Foundation - http://sakaiproject.org/ - - 2003 - sakai-component - - - components - - - - - ${project.groupId} - sakai-taggable-impl - - - ${project.groupId} - sakai-taggable-hbm - - - diff --git a/userauditservice/impl/pom.xml b/userauditservice/impl/pom.xml index 839d1c37c205..ef479ad66cca 100644 --- a/userauditservice/impl/pom.xml +++ b/userauditservice/impl/pom.xml @@ -17,10 +17,10 @@ 2013 Userauditservice implementation - jar + sakai-component - + components @@ -28,10 +28,18 @@ ${project.groupId} userauditservice-api + + ${project.groupId} + userauditservice-util + org.sakaiproject.kernel sakai-kernel-api + + org.sakaiproject.kernel + sakai-kernel-util + diff --git a/userauditservice/pack/src/webapp/WEB-INF/components.xml b/userauditservice/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from userauditservice/pack/src/webapp/WEB-INF/components.xml rename to userauditservice/impl/src/webapp/WEB-INF/components.xml diff --git a/userauditservice/pack/pom.xml b/userauditservice/pack/pom.xml deleted file mode 100644 index 4fb9da57498d..000000000000 --- a/userauditservice/pack/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - 4.0.0 - - - org.sakaiproject.userauditservice - userauditservice - 12-SNAPSHOT - - - Sakai Userauditservice Components Package (userauditservice-pack) - org.sakaiproject.userauditservice - userauditservice-pack - - Sakai Project - http://sakaiproject.org/ - - 2013 - - Userauditservice components pack (special Sakai convention). - - sakai-component - - - components - - - - - ${project.groupId} - userauditservice-impl - runtime - - - ${project.groupId} - userauditservice-util - runtime - - - - - diff --git a/userauditservice/pom.xml b/userauditservice/pom.xml index b45211c22964..d563cb2de600 100644 --- a/userauditservice/pom.xml +++ b/userauditservice/pom.xml @@ -26,7 +26,6 @@ api deploy impl - pack tool util diff --git a/userauditservice/tool/pom.xml b/userauditservice/tool/pom.xml index 2f92f07c557a..8562658bc28e 100644 --- a/userauditservice/tool/pom.xml +++ b/userauditservice/tool/pom.xml @@ -28,13 +28,13 @@ org.sakaiproject.kernel sakai-component-manager - + ${project.groupId} userauditservice-api - ${project.groupId} - userauditservice-util + org.sakaiproject.jsf + jsf-tool org.sakaiproject.jsf @@ -55,5 +55,9 @@ javax.servlet.jsp jsp-api + + javax.servlet + servlet-api + diff --git a/userauditservice/util/src/java/org/sakaiproject/userauditservice/util/UserAuditJsfTool.java b/userauditservice/tool/src/java/org/sakaiproject/userauditservice/tool/servlet/UserAuditJsfTool.java similarity index 100% rename from userauditservice/util/src/java/org/sakaiproject/userauditservice/util/UserAuditJsfTool.java rename to userauditservice/tool/src/java/org/sakaiproject/userauditservice/tool/servlet/UserAuditJsfTool.java diff --git a/usermembership/impl/pom.xml b/usermembership/impl/pom.xml index d376c2192da6..5ae2ac4f9a0d 100644 --- a/usermembership/impl/pom.xml +++ b/usermembership/impl/pom.xml @@ -13,7 +13,10 @@ This project creates the impl used by the Sakai Usermembership Tool - jar + sakai-component + + components + org.sakaiproject.kernel diff --git a/usermembership/pack/src/webapp/WEB-INF/components.xml b/usermembership/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from usermembership/pack/src/webapp/WEB-INF/components.xml rename to usermembership/impl/src/webapp/WEB-INF/components.xml diff --git a/usermembership/pack/pom.xml b/usermembership/pack/pom.xml deleted file mode 100644 index 8f647a46a9ce..000000000000 --- a/usermembership/pack/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - usermembership-base - org.sakaiproject - 12-SNAPSHOT - ../pom.xml - - sakai-usermembership-pack - org.sakaiproject - sakai-usermembership-pack - - This project creates the pack used by the Sakai usermembership Tool - - sakai-component - - components - - - - org.sakaiproject - sakai-usermembership-impl - - - - src/java - - - ${basedir}/src/bundle - - **/*.properties - - - - src/java - - **/*.xml - - - **/web.xml - - - - - diff --git a/usermembership/pom.xml b/usermembership/pom.xml index 078cdf6f3684..3e61c62a0296 100644 --- a/usermembership/pom.xml +++ b/usermembership/pom.xml @@ -15,7 +15,6 @@ api impl - pack tool diff --git a/web/pom.xml b/web/pom.xml index 3004f49f6287..05ce13a1c9e0 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -20,7 +20,6 @@ web-api/api web-impl/impl - web-impl/pack web-tool/tool web-portlet @@ -33,7 +32,6 @@ web-api/api web-impl/impl - web-impl/pack web-tool/tool web-portlet diff --git a/web/web-impl/impl/pom.xml b/web/web-impl/impl/pom.xml index c3552aad4066..736e9f20d4a6 100644 --- a/web/web-impl/impl/pom.xml +++ b/web/web-impl/impl/pom.xml @@ -15,9 +15,9 @@ http://sakaiproject.org/ 2004 - jar + sakai-component - + components diff --git a/web/web-impl/pack/src/webapp/WEB-INF/components.xml b/web/web-impl/impl/src/webapp/WEB-INF/components.xml similarity index 100% rename from web/web-impl/pack/src/webapp/WEB-INF/components.xml rename to web/web-impl/impl/src/webapp/WEB-INF/components.xml diff --git a/web/web-impl/pack/pom.xml b/web/web-impl/pack/pom.xml deleted file mode 100644 index 59d6f8b322ab..000000000000 --- a/web/web-impl/pack/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - web-base - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - sakai-web-pack - org.sakaiproject - sakai-web-pack - - Sakai Project - http://sakaiproject.org/ - - 2004 - sakai-component - - components - - - - org.sakaiproject - sakai-web-impl - - - - - -