Version Control with Java CAPS by klutzfu63

VIEWS: 28 PAGES: 19

									Version Control with
Java CAPS
September 2008

Wes Schiel
Senior Architect
Sun SOA/BI GTE

                       1
Agenda


  •   General Guidelines
  •   Java/JBI Projects
  •   Repository Projects




                     Sun Proprietary   2
General Guidelines
• In any multi-user project, always create unique
  logins for each contributor (even on POCs!)
• Synch Repository and SVN logins if possible
• Clear, detailed comments are vital to the VC
  process
• VC integration in NetBeans is excellent – don't be
  afraid to demo it to clients



                         Sun Proprietary               3
Java/JBI: Subversion




                       4
Subversion Basics
•   Free/Open Source
•   Official site: http://subversion.tigris.org/
•   Official server distro: CollabNet
•   Simpler server distro: VisualSVN
    > http://www.visualsvn.com/server/
    > No client to install
    > User-friendly graphical configuration
• NetBeans plug-in included with CAPS 6


                              Sun Proprietary      5
Subversion Configuration
• SVN server should be installed and running
• You need:
  > SVN Repository URL
  > SVN username / password
  > SVN installation path
• Add the SVN executable path (/bin) to your PATH
  environment variable



                        Sun Proprietary             6
Subversion Configuration
• NetBeans > Tools > Options




                       Sun Proprietary   7
Subversion Login
• On first Import/Checkout:




                        Sun Proprietary   8
VC Color-coding in the IDE
• Projects




• Code



                Sun Proprietary   9
VC Color-coding in the IDE
• File names




                Sun Proprietary   10
Subversion Functions
• History




               Sun Proprietary   11
Subversion Functions
• Revert




               Sun Proprietary   12
Subversion Functions
• Diff




               Sun Proprietary   13
Subversion Functions
• Merge




               Sun Proprietary   14
Subversion Functions
• Resolve conflicts




                      Sun Proprietary   15
Subversion Functions
• Commit




               Sun Proprietary   16
Repository




             17
Repository Version Control
• Same as 5.1.x
• Not compatible with CVS, Subversion, etc
• What to do with JBI + Repository projects?
  > Live with 2 VC systems
  > Regular project exports → manual commit to SVN
  > Regular artifact exports → manual commit to SVN
     – Works well with text-based files: java, xsd, etc
     – Export folder can be added as project in NetBeans




                            Sun Proprietary                18
Thank You!
Wes Schiel
wes.schiel@sun.com


                     19

								
To top