Revision: 4052
Author: seba.wagner
Date: Sun Aug 14 07:43:11 2011
Log: Install Servlet fixed, SignUp Template fixing (but not resolved)
http://code.google.com/p/openmeetings/source/detail?r=4052
Modified:
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Emailmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/adresses/Adresses.java
/branches/dev/injection/src/app/org/openmeetings/app/templates/RegisterUserTemplate.java
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
=======================================
---
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sun Aug 14 04:56:25 2011
+++
/branches/dev/injection/server/red5/webapps/openmeetings/WEB-INF/red5-applicationContext.xml
Sun Aug 14 07:43:11 2011
@@ -108,6 +108,9 @@
<entry key="generatePDF">
<ref bean="generatePDF"/>
</entry>
+ <entry key="importInitvalues">
+ <ref bean="importInitvalues"/>
+ </entry>
</map>
</property>
</bean>
@@ -126,7 +129,6 @@
<bean id="statemanagement"
class="org.openmeetings.app.data.user.Statemanagement" />
<bean id="fieldLanguageDaoImpl"
class="org.openmeetings.app.data.basic.FieldLanguageDaoImpl"/>
<bean id="fieldmanagment"
class="org.openmeetings.app.data.basic.Fieldmanagment"/>
- <bean id="importInitvalues" class="
org.openmeetings.app.installation.ImportInitvalues"/>
<bean id="cfgManagement"
class="org.openmeetings.app.data.basic.Configurationmanagement"/>
<bean id="recordingDao"
class="org.openmeetings.app.data.record.dao.RecordingDaoImpl"/>
<bean id="appointmentDao"
class="org.openmeetings.app.data.calendar.daos.AppointmentDaoImpl"/>
@@ -174,6 +176,11 @@
<bean id="whiteboardConvertionJobManagerSWFTools"
class="org.openmeetings.app.data.record.WhiteboardConvertionJobManagerSWFTools"
/>
<bean id="mailHandler" class="org.openmeetings.utils.mail.MailHandler"
/>
<bean id="feedbackManagement"
class="org.openmeetings.app.data.conference.Feedbackmanagement" />
+ <bean id="importInitvalues"
class="org.openmeetings.app.installation.ImportInitvalues" />
+
+ <!-- Templates -->
+ <bean id="registerUserTemplate"
class="org.openmeetings.app.templates.RegisterUserTemplate" />
+
<tx:annotation-driven transaction-manager="jpaTransactionManager"/>
<context:annotation-config/>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Emailmanagement.java
Sun Aug 14 04:56:25 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Emailmanagement.java
Sun Aug 14 07:43:11 2011
@@ -18,17 +18,20 @@
@Transactional
public class Emailmanagement {
- private static final Logger log =
Red5LoggerFactory.getLogger(Emailmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
-
+ private static final Logger log = Red5LoggerFactory.getLogger(
+ Emailmanagement.class,
ScopeApplicationAdapter.webAppRootKey);
+
@PersistenceContext
private EntityManager em;
-
+
@Autowired
private Configurationmanagement cfgManagement;
@Autowired
private Fieldmanagment fieldmanagment;
@Autowired
private MailHandler mailHandler;
+ @Autowired
+ private RegisterUserTemplate registerUserTemplate;
private boolean checkUserLevel(int user_level) {
if (user_level > 1) {
@@ -237,7 +240,7 @@
String verification_url = link;
- String template =
RegisterUserTemplate.getInstance()
+ String template = registerUserTemplate
.getRegisterUserWithVerificationTemplate(Username,
Userpass,
EMail, default_lang_id,
verification_url);
@@ -248,7 +251,7 @@
} else {
- String template =
RegisterUserTemplate.getInstance()
+ String template = registerUserTemplate
.getRegisterUserTemplate(Username, Userpass, EMail,
default_lang_id);
Fieldlanguagesvalues label = fieldmanagment
@@ -334,7 +337,8 @@
if (email.length() == 0)
return true;
log.debug("checkUserMail: " + email);
- Query query = em.createQuery("select c from Adresses as c where c.email
LIKE :email AND c.deleted <> :deleted");
+ Query query = em
+ .createQuery("select c from Adresses as c where c.email LIKE :email
AND c.deleted <> :deleted");
query.setParameter("email", email);
query.setParameter("deleted", "true");
int count = query.getResultList().size();
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
Sat Aug 13 21:43:12 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/data/user/Organisationmanagement.java
Sun Aug 14 07:43:11 2011
@@ -81,7 +81,7 @@
org.setDeleted("false");
org.setStarttime(new Date());
org = em.merge(org);
- em.flush();
+
long id = org.getOrganisation_id();
return id;
} catch (Exception ex2) {
@@ -222,7 +222,6 @@
em.merge(org);
}
}
- em.flush();
return org.getOrganisation_id();
} catch (Exception err) {
@@ -471,9 +470,9 @@
orgUser.setDeleted("false");
orgUser.setStarttime(new Date());
orgUser.setComment(comment);
+
orgUser = em.merge(orgUser);
- // We need this flush
- em.flush();
+
long id = orgUser.getOrganisation_users_id();
return id;
@@ -490,8 +489,6 @@
try {
orgUser.setStarttime(new Date());
orgUser = em.merge(orgUser);
- // We need this flush
- em.flush();
long id = orgUser.getOrganisation_users_id();
return id;
@@ -648,8 +645,7 @@
// Only add this single Organization add this
point cause
// cause all the other are not needed at this
point
- Users user = usersDao
- .getUser(us.getUser_id());
+ Users user = usersDao.getUser(us.getUser_id());
user.setOrganisation_users(new
LinkedList<Organisation_Users>());
user.getOrganisation_users().add(us);
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/adresses/Adresses.java
Sat Jul 23 04:28:08 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/persistence/beans/adresses/Adresses.java
Sun Aug 14 07:43:11 2011
@@ -3,8 +3,6 @@
import java.io.Serializable;
import java.util.Date;
-
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -18,117 +16,127 @@
@Entity
@Table(name = "adresses")
public class Adresses implements Serializable {
-
+
private static final long serialVersionUID = 1387576041912128161L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
-
- @Column(name="adresses_id")
- private Long adresses_id;
- @Column(name="additionalname")
- private String additionalname;
- @Column(name="comment_field")
- private String comment;
- @Column(name="fax")
- private String fax;
- @Column(name="starttime")
- private Date starttime;
+ @Column(name = "adresses_id")
+ private Long adresses_id;
+ @Column(name = "additionalname")
+ private String additionalname;
+ @Column(name = "comment_field")
+ private String comment;
+ @Column(name = "fax")
+ private String fax;
+ @Column(name = "starttime")
+ private Date starttime;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name="state_id")
- private States states;
- @Column(name="street")
- private String street;
- @Column(name="town")
- private String town;
- @Column(name="updatetime")
- private Date updatetime;
- @Column(name="zip")
- private String zip;
- @Column(name="deleted")
- private String deleted;
-
- @Column(name="email")
- private String email;
- @Column(name="phone")
- private String phone;
-
- public Adresses() {
- // TODO Auto-generated constructor stub
- }
-
- public String getAdditionalname() {
- return additionalname;
- }
- public void setAdditionalname(String additionalname) {
- this.additionalname = additionalname;
- }
-
- public Long getAdresses_id() {
- return adresses_id;
- }
- public void setAdresses_id(Long adresses_id) {
- this.adresses_id = adresses_id;
- }
-
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
-
- public String getFax() {
- return fax;
- }
- public void setFax(String fax) {
- this.fax = fax;
- }
-
- public Date getStarttime() {
- return starttime;
- }
- public void setStarttime(Date starttime) {
- this.starttime = starttime;
- }
-
- public States getStates() {
- return states;
- }
- public void setStates(States states) {
- this.states = states;
- }
-
- public String getStreet() {
- return street;
- }
- public void setStreet(String street) {
- this.street = street;
- }
-
- public String getTown() {
- return town;
- }
- public void setTown(String town) {
- this.town = town;
- }
-
- public Date getUpdatetime() {
- return updatetime;
- }
- public void setUpdatetime(Date updatetime) {
- this.updatetime = updatetime;
- }
-
- public String getZip() {
- return zip;
- }
- public void setZip(String zip) {
- this.zip = zip;
- }
-
+ @JoinColumn(name = "state_id")
+ private States states;
+ @Column(name = "street")
+ private String street;
+ @Column(name = "town")
+ private String town;
+ @Column(name = "updatetime")
+ private Date updatetime;
+ @Column(name = "zip")
+ private String zip;
+ @Column(name = "deleted")
+ private String deleted;
+
+ @Column(name = "email")
+ private String email;
+ @Column(name = "phone")
+ private String phone;
+
+ public Adresses() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public String getAdditionalname() {
+ return additionalname;
+ }
+
+ public void setAdditionalname(String additionalname) {
+ this.additionalname = additionalname;
+ }
+
+ public Long getAdresses_id() {
+ return adresses_id;
+ }
+
+ public void setAdresses_id(Long adresses_id) {
+ this.adresses_id = adresses_id;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ public String getFax() {
+ return fax;
+ }
+
+ public void setFax(String fax) {
+ this.fax = fax;
+ }
+
+ public Date getStarttime() {
+ return starttime;
+ }
+
+ public void setStarttime(Date starttime) {
+ this.starttime = starttime;
+ }
+
+ public States getStates() {
+ return states;
+ }
+
+ public void setStates(States states) {
+ this.states = states;
+ }
+
+ public String getStreet() {
+ return street;
+ }
+
+ public void setStreet(String street) {
+ this.street = street;
+ }
+
+ public String getTown() {
+ return town;
+ }
+
+ public void setTown(String town) {
+ this.town = town;
+ }
+
+ public Date getUpdatetime() {
+ return updatetime;
+ }
+
+ public void setUpdatetime(Date updatetime) {
+ this.updatetime = updatetime;
+ }
+
+ public String getZip() {
+ return zip;
+ }
+
+ public void setZip(String zip) {
+ this.zip = zip;
+ }
+
public String getDeleted() {
return deleted;
}
+
public void setDeleted(String deleted) {
this.deleted = deleted;
}
@@ -148,7 +156,5 @@
public void setPhone(String phone) {
this.phone = phone;
}
-
-
}
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/templates/RegisterUserTemplate.java
Sat Aug 13 02:42:52 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/templates/RegisterUserTemplate.java
Sun Aug 14 07:43:11 2011
@@ -12,6 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
public class RegisterUserTemplate extends VelocityLoader {
+
@Autowired
private Fieldmanagment fieldmanagment;
@@ -22,19 +23,6 @@
private static final Logger log = Red5LoggerFactory.getLogger(
RegisterUserTemplate.class,
ScopeApplicationAdapter.webAppRootKey);
- private RegisterUserTemplate() {
- super();
- }
-
- private static RegisterUserTemplate instance = null;
-
- public static synchronized RegisterUserTemplate getInstance() {
- if (instance == null) {
- instance = new RegisterUserTemplate();
- }
- return instance;
- }
-
public String getRegisterUserWithVerificationTemplate(String username,
String userpass, String email, Long default_lang_id,
String verification_url) {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sat Aug 13 05:56:03 2011
+++
/branches/dev/injection/src/app/org/openmeetings/servlet/outputhandler/Install.java
Sun Aug 14 07:43:11 2011
@@ -7,6 +7,7 @@
import java.util.LinkedHashMap;
import java.util.List;
+import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -20,8 +21,6 @@
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import org.springframework.context.ApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
public class Install extends VelocityViewServlet {
@@ -31,6 +30,15 @@
private static final long serialVersionUID = 3684381243236013771L;
private ImportInitvalues importInitvalues;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ importInitvalues = (ImportInitvalues) config.getServletContext()
+ .getAttribute("importInitvalues");
+ log.debug("in init: cfgManagement is null ? "
+ + (null == importInitvalues) + " ; " +
importInitvalues);
+ }
private static final Logger log = Red5LoggerFactory.getLogger(
Install.class, ScopeApplicationAdapter.webAppRootKey);
@@ -49,11 +57,6 @@
try {
- ApplicationContext context = WebApplicationContextUtils
-
.getWebApplicationContext(getServletContext());
- importInitvalues = (ImportInitvalues) context
- .getBean("importInitvalues");
-
ctx.put("APPLICATION_NAME", getServletContext()
.getServletContextName());
ctx.put("APPLICATION_ROOT",
@@ -69,7 +72,7 @@
+ File.separatorChar;
if (command == null) {
- log.error("command equals null");
+ log.debug("command equals null");
File installerFile = new File(working_dir
+
InstallationDocumentHandler.installFileName);
@@ -78,8 +81,8 @@
File installerdir = new
File(working_dir);
- log.error("bb " + installerFile);
- log.error("bb " + working_dir
+ log.debug("bb " + installerFile);
+ log.debug("bb " + working_dir
+
InstallationDocumentHandler.installFileName);
boolean b = installerdir.canWrite();
@@ -158,7 +161,7 @@
.getCurrentStepNumber(working_dir);
if (i == 0) {
- log.error("do init installation");
+ log.debug("do init installation");
// update to next step
//
InstallationDocumentHandler.getInstance().createDocument(working_dir+InstallationDocumentHandler.installFileName,1);
@@ -311,7 +314,7 @@
String timeZone = httpServletRequest
.getParameter("timeZone");
- log.error("step 0+ start init with values.
" + username
+ log.debug("step 0+ start init with values.
" + username
+ " ***** " + useremail + " " +
orgname + " "
+ configdefault + " " +
configreferer + " "
+ configsmtp + " " +
configmailuser + " "
@@ -360,7 +363,7 @@
importInitvalues.loadInitAppointmentReminderTypes();
// update to next step
- log.error("add level to install file");
+ log.debug("add level to install file");
InstallationDocumentHandler
.getInstance()
.createDocument(
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
