Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailHandler.java Mon Sep 10 03:55:51 2012 @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.mail; +package org.apache.openmeetings.utils.mail; -import org.openmeetings.app.OpenmeetingsVariables; +import org.apache.openmeetings.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired;
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailThread.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.mail; +package org.apache.openmeetings.utils.mail; import java.util.Date; import java.util.Properties; @@ -28,8 +28,8 @@ import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import org.openmeetings.app.OpenmeetingsVariables; -import org.openmeetings.app.data.basic.Configurationmanagement; +import org.apache.openmeetings.OpenmeetingsVariables; +import org.apache.openmeetings.data.basic.Configurationmanagement; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailUtil.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailUtil.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailUtil.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailUtil.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.mail; +package org.apache.openmeetings.utils.mail; import java.util.regex.Pattern; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailiCalThread.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailiCalThread.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailiCalThread.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/MailiCalThread.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.mail; +package org.apache.openmeetings.utils.mail; import java.io.ByteArrayInputStream; @@ -28,7 +28,7 @@ import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.util.ByteArrayDataSource; -import org.openmeetings.app.OpenmeetingsVariables; +import org.apache.openmeetings.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/SmtpAuthenticator.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/SmtpAuthenticator.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/SmtpAuthenticator.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mail/SmtpAuthenticator.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.mail; +package org.apache.openmeetings.utils.mail; import javax.mail.Authenticator; import javax.mail.PasswordAuthentication; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/CastBasicTypes.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/CastBasicTypes.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/CastBasicTypes.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/CastBasicTypes.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.mappings; +package org.apache.openmeetings.utils.mappings; import java.util.LinkedList; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/CastMapToObject.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/CastMapToObject.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/CastMapToObject.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/CastMapToObject.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.mappings; +package org.apache.openmeetings.utils.mappings; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -26,7 +26,7 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.openmeetings.app.OpenmeetingsVariables; +import org.apache.openmeetings.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/mappings/StructureMethodList.java Mon Sep 10 03:55:51 2012 @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.mappings; +package org.apache.openmeetings.utils.mappings; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.LinkedHashMap; import org.apache.commons.lang.StringUtils; -import org.openmeetings.app.OpenmeetingsVariables; +import org.apache.openmeetings.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/CalendarPatterns.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/CalendarPatterns.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/CalendarPatterns.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/CalendarPatterns.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.math; +package org.apache.openmeetings.utils.math; import java.text.SimpleDateFormat; import java.util.Date; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/GenerateRandom.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/GenerateRandom.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/GenerateRandom.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/GenerateRandom.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.math; +package org.apache.openmeetings.utils.math; import java.util.*; public class GenerateRandom { Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/math/TimezoneUtil.java Mon Sep 10 03:55:51 2012 @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.math; +package org.apache.openmeetings.utils.math; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.openmeetings.app.OpenmeetingsVariables; -import org.openmeetings.app.data.basic.Configurationmanagement; -import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl; -import org.openmeetings.app.persistence.beans.basic.Configuration; -import org.openmeetings.app.persistence.beans.basic.OmTimeZone; -import org.openmeetings.app.persistence.beans.user.Users; +import org.apache.openmeetings.OpenmeetingsVariables; +import org.apache.openmeetings.data.basic.Configurationmanagement; +import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl; +import org.apache.openmeetings.persistence.beans.basic.Configuration; +import org.apache.openmeetings.persistence.beans.basic.OmTimeZone; +import org.apache.openmeetings.persistence.beans.user.Users; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/sms/SMSHandler.java Mon Sep 10 03:55:51 2012 @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.sms; +package org.apache.openmeetings.utils.sms; -import org.openmeetings.app.OpenmeetingsVariables; -import org.openmeetings.app.data.basic.Configurationmanagement; +import org.apache.openmeetings.OpenmeetingsVariables; +import org.apache.openmeetings.data.basic.Configurationmanagement; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.smslib.OutboundMessage; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/stringhandlers/ChatString.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/stringhandlers/ChatString.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/stringhandlers/ChatString.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/stringhandlers/ChatString.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.stringhandlers; +package org.apache.openmeetings.utils.stringhandlers; import java.text.CharacterIterator; import java.text.StringCharacterIterator; @@ -25,7 +25,7 @@ import java.util.LinkedList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.openmeetings.app.OpenmeetingsVariables; +import org.apache.openmeetings.OpenmeetingsVariables; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/stringhandlers/StringComparer.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/stringhandlers/StringComparer.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/stringhandlers/StringComparer.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/stringhandlers/StringComparer.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.utils.stringhandlers; +package org.apache.openmeetings.utils.stringhandlers; public class StringComparer { Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/Application.java Mon Sep 10 03:55:51 2012 @@ -16,8 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.app; +package org.apache.openmeetings.web.app; +import org.apache.openmeetings.web.pages.MainPage; +import org.apache.openmeetings.web.pages.auth.SignInPage; import org.apache.wicket.Page; import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession; import org.apache.wicket.authroles.authentication.AuthenticatedWebApplication; @@ -32,8 +34,6 @@ import org.apache.wicket.request.IReques import org.apache.wicket.request.Url; import org.apache.wicket.request.mapper.info.PageComponentInfo; import org.apache.wicket.settings.IPageSettings; -import org.openmeetings.web.pages.MainPage; -import org.openmeetings.web.pages.auth.SignInPage; import org.springframework.context.ApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/MessageResolver.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/MessageResolver.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/MessageResolver.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/MessageResolver.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.app; +package org.apache.openmeetings.web.app; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/MessageTagHandler.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/MessageTagHandler.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/MessageTagHandler.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/MessageTagHandler.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.app; +package org.apache.openmeetings.web.app; import java.text.ParseException; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/app/WebSession.java Mon Sep 10 03:55:51 2012 @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.app; +package org.apache.openmeetings.web.app; +import org.apache.openmeetings.data.basic.AuthLevelmanagement; +import org.apache.openmeetings.data.basic.Configurationmanagement; +import org.apache.openmeetings.data.basic.Fieldmanagment; +import org.apache.openmeetings.data.basic.Sessionmanagement; +import org.apache.openmeetings.data.user.Usermanagement; +import org.apache.openmeetings.data.user.dao.UsersDaoImpl; +import org.apache.openmeetings.persistence.beans.basic.Sessiondata; +import org.apache.openmeetings.persistence.beans.user.Users; import org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession; import org.apache.wicket.authroles.authorization.strategies.role.Roles; import org.apache.wicket.request.Request; -import org.openmeetings.app.data.basic.AuthLevelmanagement; -import org.openmeetings.app.data.basic.Configurationmanagement; -import org.openmeetings.app.data.basic.Fieldmanagment; -import org.openmeetings.app.data.basic.Sessionmanagement; -import org.openmeetings.app.data.user.Usermanagement; -import org.openmeetings.app.data.user.dao.UsersDaoImpl; -import org.openmeetings.app.persistence.beans.basic.Sessiondata; -import org.openmeetings.app.persistence.beans.user.Users; public class WebSession extends AbstractAuthenticatedWebSession { private static final long serialVersionUID = 1123393236459095315L; Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/BasePanel.java) URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/BasePanel.java&r1=1382629&r2=1382635&rev=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/BasePanel.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/BasePanel.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.components; +package org.apache.openmeetings.web.components; import org.apache.wicket.markup.html.panel.Panel; Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/HeaderPanel.java) URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/HeaderPanel.java&r1=1382629&r2=1382635&rev=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/HeaderPanel.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/HeaderPanel.java Mon Sep 10 03:55:51 2012 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.components; +package org.apache.openmeetings.web.components; import org.apache.wicket.markup.html.basic.Label; Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java) URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java&r1=1382629&r2=1382635&rev=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/MenuPanel.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java Mon Sep 10 03:55:51 2012 @@ -16,8 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.components; +package org.apache.openmeetings.web.components; +import org.apache.openmeetings.data.basic.Navimanagement; +import org.apache.openmeetings.persistence.beans.basic.Naviglobal; +import org.apache.openmeetings.persistence.beans.basic.Navimain; +import org.apache.openmeetings.web.app.Application; +import org.apache.openmeetings.web.app.WebSession; +import org.apache.openmeetings.web.components.admin.user.UsersPanel; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -25,12 +31,6 @@ import org.apache.wicket.core.util.strin import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; -import org.openmeetings.app.data.basic.Navimanagement; -import org.openmeetings.app.persistence.beans.basic.Naviglobal; -import org.openmeetings.app.persistence.beans.basic.Navimain; -import org.openmeetings.web.app.Application; -import org.openmeetings.web.app.WebSession; -import org.openmeetings.web.components.admin.user.UsersPanel; public class MenuPanel extends BasePanel { private static final long serialVersionUID = 6626039612808753514L; Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPanel.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/AdminPanel.java) URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPanel.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPanel.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/AdminPanel.java&r1=1382629&r2=1382635&rev=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/components/admin/AdminPanel.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPanel.java Mon Sep 10 03:55:51 2012 @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.components.admin; +package org.apache.openmeetings.web.components.admin; +import org.apache.openmeetings.web.components.BasePanel; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; -import org.openmeetings.web.components.BasePanel; @AuthorizeInstantiation("ADMIN") public abstract class AdminPanel extends BasePanel { Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UserForm.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UserForm.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UserForm.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UserForm.java Mon Sep 10 03:55:51 2012 @@ -1,9 +1,25 @@ -package org.openmeetings.web.components.admin.user; +package org.apache.openmeetings.web.components.admin.user; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl; +import org.apache.openmeetings.data.basic.dao.OmTimeZoneDaoImpl; +import org.apache.openmeetings.data.basic.dao.ServerDaoImpl; +import org.apache.openmeetings.data.user.Organisationmanagement; +import org.apache.openmeetings.data.user.Salutationmanagement; +import org.apache.openmeetings.data.user.Statemanagement; +import org.apache.openmeetings.persistence.beans.adresses.States; +import org.apache.openmeetings.persistence.beans.basic.OmTimeZone; +import org.apache.openmeetings.persistence.beans.basic.Server; +import org.apache.openmeetings.persistence.beans.domain.Organisation; +import org.apache.openmeetings.persistence.beans.domain.Organisation_Users; +import org.apache.openmeetings.persistence.beans.lang.FieldLanguage; +import org.apache.openmeetings.persistence.beans.user.Salutations; +import org.apache.openmeetings.persistence.beans.user.Users; +import org.apache.openmeetings.web.app.Application; +import org.apache.openmeetings.web.app.WebSession; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.extensions.markup.html.form.DateTextField; @@ -19,22 +35,6 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; -import org.openmeetings.app.data.basic.FieldLanguageDaoImpl; -import org.openmeetings.app.data.basic.dao.OmTimeZoneDaoImpl; -import org.openmeetings.app.data.basic.dao.ServerDaoImpl; -import org.openmeetings.app.data.user.Organisationmanagement; -import org.openmeetings.app.data.user.Salutationmanagement; -import org.openmeetings.app.data.user.Statemanagement; -import org.openmeetings.app.persistence.beans.adresses.States; -import org.openmeetings.app.persistence.beans.basic.OmTimeZone; -import org.openmeetings.app.persistence.beans.basic.Server; -import org.openmeetings.app.persistence.beans.domain.Organisation; -import org.openmeetings.app.persistence.beans.domain.Organisation_Users; -import org.openmeetings.app.persistence.beans.lang.FieldLanguage; -import org.openmeetings.app.persistence.beans.user.Salutations; -import org.openmeetings.app.persistence.beans.user.Users; -import org.openmeetings.web.app.Application; -import org.openmeetings.web.app.WebSession; public class UserForm extends Form<Users> { Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java Mon Sep 10 03:55:51 2012 @@ -16,10 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.components.admin.user; +package org.apache.openmeetings.web.components.admin.user; import java.util.Iterator; +import org.apache.openmeetings.data.user.dao.UsersDaoImpl; +import org.apache.openmeetings.persistence.beans.user.Users; +import org.apache.openmeetings.web.app.Application; +import org.apache.openmeetings.web.components.admin.AdminPanel; import org.apache.wicket.ajax.AjaxEventBehavior; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator; @@ -30,10 +34,6 @@ import org.apache.wicket.markup.repeater import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.PropertyModel; -import org.openmeetings.app.data.user.dao.UsersDaoImpl; -import org.openmeetings.app.persistence.beans.user.Users; -import org.openmeetings.web.app.Application; -import org.openmeetings.web.components.admin.AdminPanel; public class UsersPanel extends AdminPanel { private static final long serialVersionUID = -4463107742579790120L; Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/BasePage.java) URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/BasePage.java&r1=1382629&r2=1382635&rev=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/BasePage.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.java Mon Sep 10 03:55:51 2012 @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.pages; +package org.apache.openmeetings.web.pages; +import org.apache.openmeetings.data.basic.Configurationmanagement; +import org.apache.openmeetings.web.app.Application; +import org.apache.openmeetings.web.components.HeaderPanel; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.openmeetings.app.data.basic.Configurationmanagement; -import org.openmeetings.web.app.Application; -import org.openmeetings.web.components.HeaderPanel; public abstract class BasePage extends WebPage { private static final long serialVersionUID = -6237917782433412496L; Copied: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java (from r1382629, incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/MainPage.java) URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java?p2=incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java&p1=incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/MainPage.java&r1=1382629&r2=1382635&rev=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/web/pages/MainPage.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/MainPage.java Mon Sep 10 03:55:51 2012 @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.pages; +package org.apache.openmeetings.web.pages; +import org.apache.openmeetings.web.components.MenuPanel; import org.apache.wicket.MarkupContainer; import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.openmeetings.web.components.MenuPanel; @AuthorizeInstantiation("USER") public class MainPage extends BasePage { Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java Mon Sep 10 03:55:51 2012 @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.web.pages.auth; +package org.apache.openmeetings.web.pages.auth; +import org.apache.openmeetings.web.app.Application; +import org.apache.openmeetings.web.app.WebSession; +import org.apache.openmeetings.web.pages.BasePage; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.RequiredTextField; import org.apache.wicket.markup.html.form.StatelessForm; import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import org.openmeetings.web.app.Application; -import org.openmeetings.web.app.WebSession; -import org.openmeetings.web.pages.BasePage; public class SignInPage extends BasePage { private static final long serialVersionUID = -3843571657066167592L; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/LanguageImport.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/LanguageImport.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/LanguageImport.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/LanguageImport.java Mon Sep 10 03:55:51 2012 @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.app.xmlimport; +package org.apache.openmeetings.xmlimport; import java.io.InputStream; import java.util.Iterator; +import org.apache.openmeetings.OpenmeetingsVariables; +import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl; +import org.apache.openmeetings.data.basic.Fieldmanagment; +import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues; +import org.apache.openmeetings.persistence.beans.lang.Fieldvalues; import org.dom4j.Document; import org.dom4j.Element; import org.dom4j.io.SAXReader; -import org.openmeetings.app.OpenmeetingsVariables; -import org.openmeetings.app.data.basic.FieldLanguageDaoImpl; -import org.openmeetings.app.data.basic.Fieldmanagment; -import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues; -import org.openmeetings.app.persistence.beans.lang.Fieldvalues; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; Modified: incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java?rev=1382635&r1=1382629&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java (original) +++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/xmlimport/UserImport.java Mon Sep 10 03:55:51 2012 @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.openmeetings.app.xmlimport; +package org.apache.openmeetings.xmlimport; import java.io.InputStream; -import org.openmeetings.app.OpenmeetingsVariables; -import org.openmeetings.app.data.user.Emailmanagement; -import org.openmeetings.app.data.user.Organisationmanagement; -import org.openmeetings.app.data.user.Statemanagement; -import org.openmeetings.app.data.user.Usermanagement; -import org.openmeetings.app.data.user.dao.UsersDaoImpl; -import org.openmeetings.app.persistence.beans.user.Users; -import org.openmeetings.servlet.outputhandler.BackupImportController; +import org.apache.openmeetings.OpenmeetingsVariables; +import org.apache.openmeetings.data.user.Emailmanagement; +import org.apache.openmeetings.data.user.Organisationmanagement; +import org.apache.openmeetings.data.user.Statemanagement; +import org.apache.openmeetings.data.user.Usermanagement; +import org.apache.openmeetings.data.user.dao.UsersDaoImpl; +import org.apache.openmeetings.persistence.beans.user.Users; +import org.apache.openmeetings.servlet.outputhandler.BackupImportController; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/RestAPISample.xml URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/RestAPISample.xml?rev=1382635&r1=1382634&r2=1382635&view=diff ============================================================================== --- incubator/openmeetings/trunk/singlewebapp/xdocs/RestAPISample.xml (original) +++ incubator/openmeetings/trunk/singlewebapp/xdocs/RestAPISample.xml Mon Sep 10 03:55:51 2012 @@ -32,7 +32,7 @@ <p>Result: </p> <div class="xmlcode"> <ns:getSessionResponse/><br/> - <ns:return type="org.openmeetings.app.hibernate.beans.basic.Sessiondata"/><br/> + <ns:return type="org.apache.openmeetings.hibernate.beans.basic.Sessiondata"/><br/> <div style="margin-left:20px"> <ax219:id>156971</ax219:id/><br/> <ax219:language_id xsi:nil="true"//><br/> @@ -62,7 +62,7 @@ <p>Result:</p> <div class="xmlcode"> <ns:getErrorByCodeResponse/><br/> - <ns:return type="org.openmeetings.app.data.beans.basic.ErrorResult"/><br/> + <ns:return type="org.apache.openmeetings.data.beans.basic.ErrorResult"/><br/> <div style="margin-left:20px"> <ax218:errmessage>Username not found</ax218:errmessage/><br/> <ax218:errorId>-10</ax218:errorId/><br/>
