Resolving conflict when merging

Today, we had a conflict when merging the jboss stabilization branch into the RC. Here are the steps I used to resolve it. The basic process was to first merge the RC into the jboss-stabilization branch, resolve the conflict and then merge the jboss-stabilization branch back into the RC:

552 svn co http://halsvn01/svn/hal/branches/features/jboss-stabilization
553 svn status
554 cd jboss-stabilization/
555 svn status
556 svn info
557 svn merge http://halsvn01/svn/hal/branches/RC/12.11-RC
558 svn status
559 svn resolve --accept=working halwebsite/com
560 svn status
561 svn commit -m "Sync jboss-stabilization branch with 12.11-RC"
562 ls
563 cd ..
564 rm -rf jboss-stabilization/
565 svn co http://halsvn01/svn/hal/branches/RC/12.11-RC
566 cd 12.11-RC/
567 svn merge --reintegrate http://halsvn01/svn/hal/branches/features/jboss-stabilization
568 svn status

-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com
-------------------------------------

Installing Meld on RH for compares

Source: meld-1.4.0.tar

From: Guillaume Radde [mailto:guillaume.radde@redhat.com]
Sent: Thursday, March 08, 2012 11:43 AM
To: Ruckman, Maurice (HAL); Fillman, Eric (HAL); Thompson, Sonya (HAL)
Cc: Jeff Lindesmith
Subject: Merge tool

If you would like a graphical diff tool, you can download meld-1.4.0 to your vm in the programs folder. More recent version of Meld don't work because the version of Python on the vms is too old.

http://ftp.gnome.org/pub/GNOME/sources/meld/1.4/meld-1.4.0.tar.gz

Guillaume

-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com
-------------------------------------

Encryption setup for bouncycastle

Location of file on VM:
/usr/lib/jvm/java-1.6.0-sun.x86_64/jre/lib/security/java.security
/usr/lib/jvm/java-1.6.0/jre/lib/security/java.security

Excerpt:

#
# List of providers and their preference orders (see above):
#
security.provider.1=sun.security.provider.Sun
security.provider.2=sun.security.rsa.SunRsaSign
security.provider.3=com.sun.net.ssl.internal.ssl.Provider
security.provider.4=com.sun.crypto.provider.SunJCE
security.provider.5=sun.security.jgss.SunProvider
security.provider.6=com.sun.security.sasl.Provider
security.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI
security.provider.8=sun.security.smartcardio.SunPCSC
security.provider.9=org.bouncycastle.jce.provider.BouncyCastleProvider

Log files

From: McConnell, Chris (HAL Contractor)
Sent: Tuesday, February 21, 2012 1:52 PM
To: Guillaume Radde; Thompson, Sonya (HAL); Doan, Thomas (HAL Contractor); Smith, Robert (HAL Contractor); Ruckman, Maurice (HAL); Phatak, Sheetal (HAL); Bojja, Sridhar (HAL Contractor); Fillman, Eric (HAL); Augustine, Anila (HAL)
Cc: Schumacher, Mike (HAL); jlindesm@redhat.com
Subject: RE: Webdev logs (JBoss and Apache logs for new Infrastructure)

Hello All,
The below is the log directory structure for the new JBoss infrastructure.
Note that we will sweep through the existing DEV and TST environments are reconfigure them to write their logs to their new locations.

[root@haldevjbs01 PRD]# mount -v  | grep logs
nasit:/web_nonprod/dev01_logs on /logs type nfs (rw,soft,intr,addr=10.194.45.103)

/logs/DEV
/logs/DEV/haldevweb01
/logs/DEV/haldevjbs01
/logs/DEV/haldevjbs02

/logs/TST
/logs/TST/haltstweb01
/logs/TST/haltstjbs01
/logs/TST/haltstjbs02

/logs/STG
/logs/STG/halstgweb01
/logs/STG/halstgjbs01
/logs/STG/halstgjbs02
/logs/STG/halstgjbs03
/logs/STG/halstgjbs04

Note for PRD ENV (yet to be configured/deployed),
The logs will be on a separate NFS share to be configured with the same structure:
/logs/PRD
/logs/PRD/halprdweb01
/logs/PRD/halprdjbs01
/logs/PRD/halprdjbs02
/logs/PRD/halprdjbs03
/logs/PRD/halprdjbs04

-----Original Message-----
From: Guillaume Radde [mailto:guillaume.radde@redhat.com]
Sent: Tuesday, February 21, 2012 1:15 PM
To: Thompson, Sonya (HAL); Doan, Thomas (HAL Contractor); Smith, Robert (HAL Contractor); Ruckman, Maurice (HAL); Phatak, Sheetal (HAL); Bojja, Sridhar (HAL Contractor); Fillman, Eric (HAL); Augustine, Anila (HAL)
Cc: McConnell, Chris (HAL Contractor); Schumacher, Mike (HAL); jlindesm@redhat.com
Subject: Webdev logs

You now have access to the logs from the 2 JBoss instances in webdev from your developer vm in the folders /mnt/haldevjbs01 and /mnt/haldevjbs02. We are working on standardizing the way that developers can access infrastructure server logs so those path might change in the future. We'll let everybody know if we change it.

Thanks!

-------------------------------------
Guillaume Radde
Senior Consultant, Red Hat Consulting
guillaume.radde@redhat.com
http://www.redhat.com
-------------------------------------

XStart Support Tickets

-----Original Message-----
From: Schumacher, Mike (HAL)
Sent: Thursday, February 16, 2012 9:53 AM
To: 'Guillaume Radde'
Cc: Augustine, Anila (HAL); Thompson, Sonya (HAL); Ruckman, Maurice (HAL)
Subject: RE: Xmanager

Yes, we have support. You can open a ticket at http://www.netsarang.com/support/request_form.html if you need my help let me know. I actually think I had this problem yesterday.

Mike

-----Original Message-----
From: Guillaume Radde [mailto:guillaume.radde@redhat.com]
Sent: Thursday, February 16, 2012 9:37 AM
To: Schumacher, Mike (HAL)
Cc: Augustine, Anila (HAL); Thompson, Sonya (HAL); Ruckman, Maurice (HAL)
Subject: Re: Xmanager

Mike, do we have any kind of support with XManager? Developers are having issues where Xmanager locks up if they don't touch the Window for a few hours.

Guillaume

----- Original Message -----
From: "Maurice Ruckman (HAL)" <MRuckman@HollandAmerica.com>
To: "Sonya Thompson (HAL)" <SThompson@HollandAmerica.com>
Cc: "Guillaume Radde" <guillaume.radde@redhat.com>, "Anila Augustine (HAL)" <AAugustine@HollandAmerica.com>
Sent: Thursday, February 16, 2012 9:57:40 AM
Subject: Xmanager

FYI -- I installed the latest version of Xmanager and kept my VM open overnight and it still stopped working, and effectively locked-up on my machine.

Thanks,

Maurice Ruckman
Voice: (206) 626-7497 x67497
Cellular: (206) 650-7576

Selenium for browser based playback

Selenium automates browsers. That's it. What you do with that power is entirely up to you. Primarily it is for automating web applications for testing purposes, but is certainly not limited to just that. Boring web-based administration tasks can (and should!) also be automated as well.

Selenium has the support of some of the largest browser vendors who have taken (or are taking) steps to make Selenium a native part of their browser. It is also the core technology in countless other browser automation tools, APIs and frameworks.

Refer: http://seleniumhq.org/